Merge remote-tracking branch 'origin/master' into Justin's-Update
Merge remote-tracking branch 'origin/master' into Justin's-Update
Update Character and CharAI class functions

Character AI updates the states of the character in the update function.
Merge pull request #6 from gapchan89/Justin's-Update

Justin's update