Remove Bootstrap CSS, include from bootstrap-sass
merging conflicts