add content to landing
Merge branch 'master' of github.com:bcroesch/perky

Conflicts:
	app/views/layouts/landing.html.erb
Merge branch 'master' of github.com:bcroesch/perky