Changes
Fix the ghetto router
Merge branch 'master' of https://github.com/wtfaremyinitials/Host

Conflicts:
	client/welcome/welcome.html