bug fixes and ui shit
Merge branch 'master' of https://github.com/danmartelly/SugarRush