merging bootstrap with development