Final commit for semester

Included all files and ready for submission