add comments and javadoc
change parseFrom lines
Merge branch 'master' of https://github.com/mulias/csc207-JSONProject
add citation
refactor to match new viewFromSource methods
don't know what I changed, but whatever
merge