valid travis.yml?
Merge branch 'master' of github.com:teamaker/WebsiteManagement

Conflicts:
	.travis.yml