Progressbar etc
Merge branch 'master' of https://github.com/stefanetoh/Iprog14_Group20_Project

Conflicts:
	js/controllers.js
	views/mainView.html