fix
Merge branch 'master' of https://github.com/fitzlucassen/Room25

Conflicts:
	JS/Controller/client.js