Moved Player Health and Energy to the Player Object
Merge Commit
Merge remote-tracking branch 'origin/master'