added dummy travis.yml
Merge branch 'master' into bad

Conflicts:
	.travis.yml