colour
Merge branch 'master' of https://github.com/Hidendra/CSCI3130-Group1

Conflicts:
	web/js/hotspot.js
Merge branch 'master' of https://github.com/Hidendra/CSCI3130-Group1