End Game & Update Player Resource
Merge remote-tracking branch 'origin/master'