Added some buttons and moved the shop UI around
Merge branch 'master' of https://github.com/dHelmgren/Portland-Indie-Speed-Run-2013