Merge pull request #7 from lu16j/master

req
pulling richard's stuff and updating controller
pulling richard's stuff and updating controller
fixed file handler function
made the json editor and got functionality working
made the json editor and got functionality working and now merging with richard
Merge pull request #1 from michelleoj/master

req