Add Omniauth Facebook login attempt#4
Resolved merge conflicts with KDiff3