parse1 'house-keeping': exceptions & comments
Merge branch 'master' of https://github.com/mulias/csc207-JSONProject

Conflicts:
	src/edu/grinnell/callaway/JSONParser.java
	src/edu/grinnell/callaway/JSONTester.java