updated gitignore
Merge branch 'master' of https://github.com/hollyanne00/cg