wording
Merge branch 'master' of github.com:keybase/triplesec

Conflicts:
	site/index.html
wording