landing page base template
Merge branch 'master' of https://github.com/zachlevy/asynchealth

Conflicts:
	app/assets/javascripts/application.js
	app/views/welcome/index.html.erb