Update .gitignore
Merge branch 'master' of https://github.com/imouto1994/CS3246-Assignment-1