minor procfile change
Merge branch 'master' of https://github.com/dancingshell/MixnMatch into kaitlin2
rdio now playing and connected with angular
added music to controller js
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
Cleaned up merge conflicts