avoid warnnings
Merge branch 'master' of git@github.com:fengzishiren/JsonParser.git

Conflicts:
	src/Log.java