game controller and views added
Merge branch 'master' of https://github.com/cugamer/flash_cards into game_controller
app views, controllers, css updated
merge conflict