need to pull so committing some small defense tweaks
fixed merge conflicts
attack weak enemy priority added to attack move
Merge branch 'master' of https://github.com/hungryha/battlecode