Setup delayed jobs for grabbing last.fm artist images
Merge branch 'Brandon'
Merge to test delayed jobs and sidekiq
d an empty message aborts
Fixed merge conflicts
updating
Added current_artists get_events
Merge pull request #16 from dancingshell/Brandon

Added current_artists get_events
Merge branch 'Kyle'
cause rails!
cause github makes me do this 5 times and im going to give them a piece of my mind in SF
Fixed Gemfile.lock
Merge branch 'master' into Brandon
Fixing merge conflicts
Restored original dump file for Redis
Merge pull request #18 from dancingshell/Brandon

Brandon
Merge changes

Conflicts:
	app/controllers/sessions_controller.rb.orig
	app/views/static/index.html.erb
minor changes to fix merge
fixed bug when users enter in lastfm account and their either dont have any top tracks in the last month or the username does not exist. removed orig files.