initial facebook
fixing gitignore merge conflicts