- almost done with the homepage
Merge branch '1.0' of https://github.com/simian-lab/website into 1.0

Conflicts:
	app/scripts/main.js
	app/styles/main.scss