Some really basic test stuff
Merge branch 'master' of https://github.com/JJMcConnell/Software-Engineering-Project

Conflicts:
	mean-master/public/modules/core/views/home.client.view.html
The buttons on the front page actually choose a room now
Merge branch 'master' of https://github.com/JJMcConnell/Software-Engineering-Project

Conflicts:
	mean-master/public/modules/core/views/home.client.view.html