Merge pull request #10 from DaBungalow/updated-bootstrap

Updated bootstrap
document the last merge