Fix merge conflicts
added video to landing bg, aligned cohort divs
Fix merge conflicts

Conflicts:
	app/assets/javascripts/views/cohort.js
	app/views/home/index.html.erb
Merge branch 'klovelacek-background'
Add neat, bitters, and refills