updated images and minor changes
Merge branch 'master' of https://github.com/dancingshell/MixnMatch into kaitlin2
pushing to heroku
Merge branch 'kaitlin2'
added gems
precompiled
Merge pull request #12 from dancingshell/Brandon

Added 3month period callback for Last.fm top artists and reformatted cal...
can add events and event_artist joint table, however sidekiq still needs to be implemented
Merge branch 'Kyle'
because i need to dammit
added events and event_artist
Users can now upload an avatar image directly to Amazon s3
Merge branch 'master' of https://github.com/dancingshell/MixnMatch
users can now linked their facebook account after first logging in through mixnmatch auth.
fixed bug when logging out
added that love matching algorithm
Merge pull request #14 from dancingshell/Kyle

added that love matching algorithm
pushing as kaitlin
Merge branch 'master' of https://github.com/dancingshell/MixnMatch

Conflicts:
	app/controllers/sessions_controller.rb
Merge branch 'Brandon'
Merge to test delayed jobs and sidekiq
d an empty message aborts
Fixed merge conflicts