added conflict statement
Merge branch 'master' of https://github.com/dominicrayas/CSCI-3308lab3

Attempting to pull partner's edits
Commit the merge