removed additonal preferences in procfile
change procfile
seperated proc files
hopefully fixed logo for heroku deploy
added location to profile show
Merge branch 'master' of https://github.com/dancingshell/MixnMatch
meriging with events page
added working rdio player
Fixed merges with user profiles