More clean-up and comments
Merge branch 'master' of https://github.com/stefanetoh/Iprog14_Group20_Project

Conflicts:
	app/views/mainView.html