conflict up ahead
Merge branch 'master' of github.com:keybase/go-jsonw

Conflicts:
	jsonw.go