facts
Merge branch 'master' of https://github.com/ProjectStasis/website

Conflicts:
	home.html