Test fork merge betweem JamesTimms and Boomer.
Merge branch 'master' of https://github.com/herman-rogers/IndieSpeedRun2013
Merge branch 'master' of https://github.com/herman-rogers/IndieSpeedRun2013
Merge branch 'master' of https://github.com/herman-rogers/IndieSpeedRun2013