changed redirect to boostrap.html
fixing merge conflicts