removed the scaffold.css because it was intefering with bootstrap
Merge branch 'scaffold-css'