Added time-delay conversion, health bars, and toggle HUD. Restructured input handler. Reorganized collisioncontroller (still doesn't work).
Merge branch 'master' of https://github.com/lilyc5459/cs3152
Added attacking, ally AI
Merge branch 'master' of https://github.com/lilyc5459/cs3152
changed content factory for new content file names