Adding .DS_Store to gitignore
Merge branch 'master' of https://github.com/Sykel/UBC-CPSC304-p3
Removing DS_Store file