Serious bug fixed
Merge branch 'master' of git@github.com:fengzishiren/JsonParser.git

Conflicts:
	src/Lexer.java
	test/JSONTest.java