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

Conflicts:
	package.json
some more ignoring for smaller keybase client tarball