enemy a.i.
Merge branch 'nathan'