Revert 4c41cca..22b5f82

This rolls back to commit 4c41cca147a9d6f47ffd14c521b57036f30db3af.
Revert 22b5f82..fbf4d67

This rolls back to commit 22b5f828c1de29870e59273065e4e10280528082.
Stuff
Merge branch 'master' of https://github.com/xarvey/find-a-room