Merge branch 'develop' of https://github.com/elwhizard/MeRoRs into addRoom
Changed new_view.js
	- changed “Add Room!” to “Add Room”
Merge branch 'develop' of https://github.com/elwhizard/MeRoRs into addRoom
change test
Merge branch 'develop' of https://github.com/elwhizard/MeRoRs into addRoom
Changed new_view.js

	- Changed “Add-room” to “Add Room”
Merge branch 'develop' of https://github.com/elwhizard/MeRoRs into addRoom
Merge branch 'develop' of https://github.com/elwhizard/MeRoRs into develop
changed new_view.js
Merge branch 'addRoom' into develop