Added Armor to enemies
Merge remote-tracking branch 'origin/master' into Cole
Merge remote-tracking branch 'origin/master' into Cole