fixing bootstrap problem
Merge branch 'adding-bootstrap'