init
removed unused methods from deckscontroller
refactoring code in controllers
created feature tests based on registering users
init
removed unused methods from deckscontroller
refactoring code in controllers
created feature tests based on registering users
Resolved conflicts in preparation for merge
Resolved last merge conflict
Fixed bug in deck model
Merge pull request #22 from raccoons-2014/featuretests

All clear. Merged!
initial commit and cards now being shown from deck
Last commit before rebase and eventual merge
Fixed merge conflicts via rebase.
Fixed conflict