update gitignore
Merge branch 'master' of https://github.com/BLNorris/project-git