added travis.yml
Merge remote-tracking branch 'remotes/o/master'

Conflicts:
	.travis.yml