Merge branch 'adam-steel'
Adds balanced gem.
Links balanced.js
Merge branch 'playing-with-balanced'
sorts out centering of grids

still an issue with mobile/tablet centering
adds base-min.css to application.html.erb
Merge branch 'ad-ccs-home-3.24'

Conflicts:
	app/views/layouts/application.html.erb
finally solves centering for mobile
Merge branch 'ad-css-home-3.26'
Merge branch 'adam-steel'
Merge pull request #6 from DenglSteel/adam-steel

Adam steel
Merge branch 'master' of https://github.com/DenglSteel/coElv2
Merge branch 'master' of https://github.com/DenglSteel/coElv2
changes marketing and custom to scss
changes old-is.css to scss and updates color variables

color variables now included in marketing and custom.css
adds carousel to home page
Merge branch 'ad-4.1_homepage'
updates
updates home and footer

adds overlay to carousel
changes some text in home and footer
Merge branch 'ad-4.2_carousel_overlay'