First module is almost there
Merge branch '1.0' of https://github.com/simian-lab/website into 1.0

Conflicts:
	app/index.html