Made the join room button work 'kind of' like it actually will.
Merge branch 'master' of https://github.com/m1ck3y/estabomb

Conflicts:
	web/index.html