Added a few new rooms and we now normalize the meeting location before looking it up.
Merge branch 'master' of https://github.com/dfcf93/MakitsuDay

Conflicts:
	public/js/main.js
Merge branch 'master' of https://github.com/dfcf93/MakitsuDay

Conflicts:
	public/js/main.js