Merge branch 'master' of https://github.com/adoueb/myTravels

Conflicts:
	.travis.yml