update
Merge branch 'master' of git@github.com:fengzishiren/pyjson.git

Conflicts:
	tests/testjson.py