Merge pull request #70 from ryanadair009/master

Player and Goblin
Merge remote-tracking branch 'upstream/master'
stuff