removed merges
Stash
small changes
Small changes -- James
Merge branch 'master' of https://github.com/herman-rogers/IndieSpeedRun2013