deleted progressbar.js
Merge branch 'master' of https://github.com/advincze/mhd2014

Conflicts:
	public/app/index.html
	public/app/scripts/progressBar.js