update
Merge branch 'master' of https://github.com/rfkdali/progbarjs

Conflicts:
	presentation.html