bug fix
Merge branch 'master' of github.com:RAttab/battlecode-2013