lab finished
Merge branch 'master' of github.com:renatogn/csc475-lab1