Fixed the tests
Merge https://github.com/Khoa94/Assign7

Conflicts:
	bin/JSON/ArrayListToJSONString.class
	bin/JSON/HashtableToJSONString.class
	bin/JSON/JSONParser.class
	bin/JSON/JSONParserTest.class
	src/JSON/JSONParser.java
	src/JSON/JSONParserTest.java