Added documentation, prepping for merge
Merge branch 'master' of https://github.com/deweytyl/csc207-project
Merge branch 'master' of https://github.com/deweytyl/csc207-project

Conflicts:
	src/edu/grinnell/mhctd/json/JSONNumber.java
	src/edu/grinnell/mhctd/json/JSONUtils.java