added fb nad twitter links
fixed conflicts