new bootstrappy layout
Merge branch 'bootstrappy'

new bootstrappy layout