Added sass bootstrap
Removed old css
Merge branch 'new-bootstrap-layout'

Conflicts:
	Gemfile