start writing doc
Merge branch 'master' of https://github.com/mulias/csc207-JSONProject
fix lots of merge errors
fix yet more merge errors