updated with bootstrap and images, needs content
updated with bootstrap and images, needs content
merged index conflict