Added .travis.yml

Conflicts:
	.travis.yml