gitignore update
Merge branch 'master' of https://github.com/AmishLou/CS106A