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