Migrated artists to have images, styled artist images, and began styling profiles
Fixed merges with user profiles
Merge pull request #30 from dancingshell/Brandon

Migrated artists to have images, styled artist images, and began styling...
Merge branch 'kaitlin2'
merge radio with artist formatting
Conflicts:
	app/views/partials/_navbar.html.erb
	db/schema.rb
precompiled
precompiled
users can now play radio of the artist page they are on
precompiled
precompiled
added matches algorithm and filtering based on preference and age
Merge branch 'KyleR'
"merged matching functions and filtering by preference and age"
Conflicts:
	Gemfile
	app/assets/javascripts/app/controllers.js
	app/controllers/users_controller.rb
	app/views/users/show.html.erb
	dump.rdb
 tried to implement google login. added correct fb permissions
Merge branch 'master' of https://github.com/dancingshell/MixnMatch
precompiled
Styled profile pages, and fixed linking to profiles and editing profiles
Cleaned up merge conflicts
Merge pull request #31 from dancingshell/Brandon

Styled profile pages, and fixed linking to profiles and editing profiles
fixed bug in angular controller and session create
precompiled
Minor fixes