Refactored the game controller
Merge branch 'master' of https://github.com/GeoffCrittenden/flash_cards into controller_refactor

Conflicts:
	public/css/application.css
Merge pull request #15 from GeoffCrittenden/controller_refactor

Refactored the game controller