Fix js
Merge branch 'master' of https://github.com/CarletonDevX/room-draw

Conflicts:
	admin.html