Add omniauth for facebook
fixed more merge conflicts
Merge branch 'brandonjyuhas-master'
fixed merge conflicts