little changes
Merge pull request #14 from varunrau/joel/game_view

little changes
sigh what
merge conflicts