Undo a change that was incorrect
Redid a change that got messed up in a previous commit
Merge branch 'master' of https://github.com/mrsonicblue/theaquanauts