changed gems passed to location view
Merge branch 'master' into player-controller
Merge pull request #1 from JacobKorn/player-controller

Player controller