users can now linked their facebook account after first logging in through mixnmatch auth.
fixed bug when logging out
pushing as kaitlin
Merge branch 'master' of https://github.com/dancingshell/MixnMatch

Conflicts:
	app/controllers/sessions_controller.rb