findaroom.js
Merge branch 'master' of https://github.com/xarvey/find-a-room

Conflicts:
	findaroom/findaroom.js