n
Merge branch 'master' of https://github.com/SamuSan/SWEN302_RumBukka_Project

Conflicts:
	Web/Controllers/addBookingController.js
	Web/Controllers/addPersonController.js
	Web/Controllers/roomTimelineController.js
	Web/addBooking.html
	Web/addPerson.html
	Web/index.html
	Web/modifyBooking.html
	bower_components/angular/.bower.json
	bower_components/angular/README.md
	bower_components/angular/angular-csp.css
	bower_components/angular/angular.js
	bower_components/angular/angular.min.js
	bower_components/angular/angular.min.js.map
	bower_components/angular/bower.json
	bower_components/ngQuickDate/.bower.json
	bower_components/ngQuickDate/.gitignore
	bower_components/ngQuickDate/LICENSE.txt
	bower_components/ngQuickDate/README.md
	bower_components/ngQuickDate/bower.json
	bower_components/ngQuickDate/demo.html
	bower_components/ngQuickDate/dist/ng-quick-date-default-theme.css
	bower_components/ngQuickDate/dist/ng-quick-date-plus-default-theme.css
	bower_components/ngQuickDate/dist/ng-quick-date.css
	bower_components/ngQuickDate/dist/ng-quick-date.js