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

Conflicts:
	index.html