login
working on login. update sessions and user controlls.
able to capture data from user and put in db
captured last.fm token
completed login, user authentication, and user creation
please work
capturing username from last_fm
fixed conflicts
fixed more merge conflicts
Merge branch 'master' of https://github.com/Goodank/theCompilation
Merge branch 'login'
fixing conflicts