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