progress bar stuff
remerging
Merge branch 'master' of https://github.com/GameBuilders/student-gdc-2014
lives
git push