adding facebook buttons
resolving merge conflicts