Merge pull request #17 from ryanadair009/master

Updated FSM
Merge pull request #18 from ryanadair009/master

BVGFFRSWEGFWEGFWEFUGGEG :)
fixing some AI bugs, combat bugs, updating enemygroup prefab
uhhh... prefab commit?
Merge remote-tracking branch 'upstream/master'