Refactoring & Adding % in the progress bar
update
Merge branch 'master' into world-cup-hristo

Conflicts:
	app.js
	index.html