refactored ally and enemy targetting logic, added 7 new item types and implemented all but Attack and Mystery
Merge branch 'master' of https://github.com/lilyc5459/cs3152