We have a site!
Merge branch 'master' of https://github.com/JedWatson/touchstone

Conflicts:
	site/public/index.html