added bootstrap.min.css
removed bootstrap-sass
Merge branch 'cleanup-css'