Add facebook pictures
Fix merge conflicts