improvements
Merge branch 'hc_landing'

Conflicts:
	app/assets/javascripts/scripts.js