cleaned up bootstrap includes and folder
merged index because git is complaining