quick change
style changes
Merge branch 'master' of github.com:corneljr/poker_app

Conflicts:
	game.rb
	views/new_game.erb