Undoing a partial merge error
Undoing a partial merge error
Merge branch 'master' of github.com:RoomFly/RoomFly.github.io
Moved bootstrap.js below jquery load
fixed the variable name of size to room_size
Merge branch 'master' of https://github.com/RoomFly/RoomFly.github.io
added margins and general formatting changes
Merge branch 'front-end'
Fixed the issue with the query for the room size. Coded with Peicong and Liu
Integrated the query results with the frontend so now it can be displayed. Coded with Peicong and Liu
Merge branch 'master' of https://github.com/RoomFly/RoomFly.github.io
added call to buildRoomList
created a roomObj to return to the frontend
Merge branch 'master' of github.com:RoomFly/RoomFly.github.io into roomstubs