Merge pull request #2 from sthuber90/development

replace CRLF line ending with LF

file.tmp

@@ -1,9 +0,0 @@
-
-    AWSTemplateFormatVersion: '2010-09-09'
-    Description: Simple CloudFormation Test Template
-    Resources:
-      S3Bucket:
-        Type: AWS::S3::Bucket
-        Properties:
-          AccessControl: PublicRead
-          BucketName: cf-test-bucket-1

travis_moto_server.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
-set -e
-pip install flask
-pip install /moto/dist/moto*.gz
+#!/usr/bin/env bash
+set -e
+pip install flask
+pip install /moto/dist/moto*.gz
 moto_server -H 0.0.0.0 -p 5000