Inclass

Committing work done in class.
More Class

committing more inclass changes
Complete

completed assignment files
JSON file problem

Committing changes made to the Data.json file that was preventing the
data from loading to the page.
Merge branch 'master' into gh-pages