Got json info for morris.js....maybe
Merge branch 'master' into alyssa
Finished getting json working with morris.js
Merge branch 'master' into alyssa