working on facebook oauth
resolving merge conflicts