Added EventWorker when new artists are imported, and cleaned up user_accounts controller
Merge pull request #26 from dancingshell/Brandon

Added EventWorker when new artists are imported, and cleaned up user_acc...
Merge branch 'kaitlin2'
precompiled
Removed cached dump.rdb for .gitignore
Removed cached dump.rdb for .gitignore
Merge branch 'master' into Brandon
Trying to remove cached dump.rdb for .gitignore
Merge branch 'Brandon' of https://github.com/dancingshell/MixnMatch
Trying to remove cached dump.rdb for .gitignore
changin avatar for heroku
added ruby version to gem file
Fixing dump.rdb merge conflicts
Removed cached dump.rdb for .gitignore
Merge branch 'master' into Brandon
Fixing merge conflicts with dump.rdb
Cleaned up .orig files
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
fixed bug in removing user_artist
changed unicorn worker count