Merge branch 'master' of C:\Alina Files\1st Year\First Semester\CSC180\Assignment 2 with conflicts.
1d last error case not solved
1e written up