updated .gitignore
Merge branch 'master' of github.com:byuCs428CRS/cs428crs