Created MixnMatch user signup and login, and profile model and controller
Merge pull request #7 from dancingshell/Brandon

Created MixnMatch user signup and login, and profile model and controlle...
Created Profile model and setup profile controller and form for current_user
Merge pull request #8 from dancingshell/Brandon

Created Profile model and setup profile controller and form for current_...
Merge branch 'master' of https://github.com/dancingshell/MixnMatch

Conflicts:
	config/routes.rb
Created accounts page to link Spotify, Rdio, and Last.fm user_accounts
Merge pull request #9 from dancingshell/Brandon

Created accounts page to link Spotify, Rdio, and Last.fm user_accounts
Merge branch 'master' of https://github.com/dancingshell/MixnMatch into kaitlin2
pushing to heroku