changing travis
Merge branch 'master' of https://github.com/shuron/lfgm.git

Conflicts:
	.travis.yml