Create .travis.yml
Delete .travis.yml
Merge origin/master into Test
Merge origin/Test into Test