Merge branch 'master' of github.com:layeka/qjson

Conflicts:
	qjson.go
Merge branch 'master' of github.com:layeka/qjson

Conflicts:
	qjson.go