added bootstrap

merging from master into gh-pages