changes from playtest

-makeshift HUD- stance, hp bars, cooldowns
-companion targets from player
-Companion moves randomly when no aggro
-companion teleports to player when far enough
-companion stays in nearer range in defense mode
Resolve merge conlict

merging master into my branch to resolve conflict
Merge pull request #23 from jpmeenagh/Johns-11-playtest-fixes

changes from playtest
Revert "changes from playtest"

This reverts commit 25101117973eb3bebd82856076575bc996773078.
Merge branch 'master' of https://github.com/jpmeenagh/Capstone_1_Project_Fall_2014