updated gitignore
Merge branch 'master' of https://github.com/lang1991/CSCI420