starting omniauth with facebook
gemfile conflict
Merge branch 'ld_mailers'