Merged copy
Merge branch 'master' of https://github.com/BharathParameswaran/CS2102_Project

Conflicts:
	js/hotelBooking.js
merged