working on drawing combat correctly
Merge branch 'master' of https://github.com/syntaxblitz/apcs-2014-final