updated progress bar

sleep and dirt factor update on progress bar
Merge branch 'master' of https://github.com/ejwaibel/GWDA243_Spring2014

Conflicts:
	js/main.js