typo in travis.yml
Merge branch 'master' of github.com:bootphon/ABXpy

Conflicts:
	.travis.yml