Ooops, typo in the travis conf
Merge branch 'master' of github.com:xseignard/nn_contribution

Conflicts:
	.travis.yml