this isnt working!
Test
exclude current player from list of players for game
added some style (gross) to the app
cleaned up if statement
Merge branch 'james' into develop

* james:
  cleaned up if statement
  added some style (gross) to the app
  exclude current player from list of players for game
changing login
fixed grammer issues and added running_average
changed dashboard to home page
All test pass
Merge branch 'qa' of https://github.com/theprogram/floppy-disc into qa

* 'qa' of https://github.com/theprogram/floppy-disc:
  changed dashboard to home page

Conflicts:
	features/login.feature
	features/step_definitions/login.steps.rb
adding finished game
Merge branch 'qa' into develop

* qa:
  adding finished game
  All test pass
  changed dashboard to home page
  changing login
  Test
  this isnt working!

Conflicts:
	app/views/games/show.haml
upgraded the ui enough to stop the eyes from gushing blood