less bland styling
Merge branch 'master' of github.com:tlevine/kryptonite

Conflicts:
	public/index.html