Fixed file location problems
Merge branch 'master' of https://github.com/davidreid/battlehack
Fixed file location problems