another try to prove
Merge branch 'master' of https://github.com/sebastianf/keybase.md

Conflicts:
	keybase.md