the second commit of the bootstrap project
Merge branch 'master' of https://github.com/Andymic/SiteWithBootstrap