facebook connect setup
conflicts solving
Merge pull request #5 from Eschults/add-facebookconnect

facebook connect setup