add .travis.yml
Merge branch 'travisci' into test-branch

Conflicts:
	.travis.yml