fixed description
Merge branch 'master' into fixusers

Conflicts:
	app/views/decks.erb
Merge pull request #22 from alistairhill/fixusers

fixed description