added omniauth gems and files to connect with facebook
fix merge conflicts
fix merge conflict x2
Merge branch 'master' of https://github.com/stephanieguo/friendswap

pull from master
added basic facebook login integration. can login/signup users with facebook
Merge branch 'master' of https://github.com/stephanieguo/friendswap into feb9releaseViv

Conflicts:
	app/models/user.rb
	app/views/listings/listing.html.erb
	db/schema.rb
preliminary changes to get current logged in user, email info
Merge branch 'master' of https://github.com/stephanieguo/friendswap

mege in Vivian's changes
added dashboard
checks if user is logged in
added dashboard