Makes CardView
Fast forward and fix conflicts
remove buggy line
Merge pull request #11 from varunrau/joel/game_view

Joel/game view