Trying again to untrack these files
Ignoring the file that gets created when you open the project
Merge branch 'master' of https://github.com/rxvcgiii/COMP465-project1
I'm pretty sure we're ignoring the correct files, now
Merge branch 'master' of https://github.com/rxvcgiii/COMP465-project1