commit for pulling
Merge branch 'master' of https://github.com/hungryha/battlecode
Merge branch 'master' of https://github.com/hungryha/battlecode
rush code fix