changin avatar for heroku
added ruby version to gem file
Merge pull request #28 from dancingshell/Brandon

Brandon
modified nav bar to make it more user functional
Merge branch 'master' of https://github.com/dancingshell/MixnMatch
mergin removed dump file with kaitlin2
Conflicts:
	dump.rdb
users can now remove artists from their collection (user_artists) from the artist index page
Changed user profile pages and setup events page