added bootstrap social
merged conflicts