Task 7.6

Merged code so that Player and Monster use StateMachine correctly.