Updated .gitignore
Merge branch 'master' of https://github.com/zerothehero33/CPSC4910