added devise resources
fixed routes for devise, still need to add username field for registration
Merge branch 'master' into association_testing
Merge pull request #5 from nairys/association_testing

Association testing