Added devise but have not added it to the user model yet
Got devise to start working
Logged in with pwd set up and working
Fixed up the nag links / buttons
Changed all references to '@auth' to be 'current_user'
Fixed factories so that passwords are long enough for Devise config
Missed one…
Fixed the redirect after the user 'claims their account' for the first time
Forgot to remove claim link from homepage
Aug 27
Added buttons to the nav
Merge branch 'use-after-database-authentication-instance-method' of github.com:strivedi183/spotifriends into use-after-database-authentication-instance-method
group_users partial
fixed the way we were addressing the group_form partial
Some minor mods to get tests back to passing after adding in Devise
All tests passing
CanCan WIP
fixing group stuff
FINALLY
Just updating schema.rb
Merge branch 'adjust-tests-for-devise' into group-view

Resolved Conflicts:
	app/views/contests/new.html.haml

Also added handling of songs by CanCan