Update the landing page
Merge branch 'master' of https://github.com/averrin/emergent

Conflicts:
	templates/index.html