On branch master
 Changes to be committed:
	modified:   .travis.yml
Merge branch 'master' of https://github.com/amlang/travistest

Conflicts:
	.travis.yml