https://github.com/1240/HOBBIE/issues/50
Merge remote-tracking branch 'origin/master'

Conflicts:
	HOBBIE/room/templates/makeroom.html