got pickaxe in nuke defense for squares
fixing conflicts
gotoloccareful
fixing merge conflicts
merge conflict fix. we need the regroup command to require same # of soldiers as attack command
Merge branch 'master' of https://github.com/hungryha/battlecode
possibly working defend code?
Merge branch 'master' of https://github.com/hungryha/battlecode
possible working defend code?