Yay HP works
Fixed conflict
Merge branch 'master' of https://github.com/danmartelly/SugarRush
Took out some uncommented stuff