Clean up login page
Creation of decks
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/index.rb
Adding workspace.xml
Merge remote-tracking branch 'origin/master'