Corrected files
Merge branch 'master' of https://github.com/Evidlo/engr132