Added bootstrap-sass to GemFile, created custom.css.scss file to hold css styling per M Hartl
Fix merge conflicts