Merge branch 'master' of https://github.com/cbilstra/Kethodo

Conflicts:
	Welcome.html