moved around layouts and changed css
finished editing deck play layout/css
Merge remote-tracking branch 'origin/master' into css

Conflicts:
	flash-cards/app/views/deck/index.erb
	flash-cards/app/views/deck/play.erb
	flash-cards/app/views/deck/round_stats.erb
	flash-cards/app/views/users/show.erb