added stuff from class
Merge branch 'master' of github.com:sydneyacaputo/pd9_DatAwsumProject_SydneyC-NazifaI-TimD