Initial Design using bootstrap
Removed duplicate of application.css.scss
Merge branch 'bootstrap_design'
Merged master with bootstrap