changed filenames
Merge branch 'master' of https://github.com/scott-mtl/comp345.git