Travis-CI initial integration
Merge branch 'master' of github.com:/Alkemic/webpage

Conflicts:
	.travis.yml