Final commit hopefully
Merge branch 'master' of https://github.com/Fumler/program_proj1