Done so much stuff, I have lost track
Merge branch 'master' of https://github.com/davidreid/battlehack