travis try again
Merge branch 'master' of github.com:thoutbeckers/W.hen

Conflicts:
	.travis.yml