Fixed Object and array
Merge branch 'master' of https://github.com/deweytyl/csc207-project

Conflicts:
	src/edu/grinnell/tranchri/cohnhan/deweytyl/hardtmad/JSONString.java