Modified .gitignore to include prog.
Merge branch 'master' of https://github.com/jordanywhite/cs376Proj