modified gitignore file
Merge branch 'master' of https://github.com/xcatz/cs421ProjectA
FUCK YOU GIT
pre-merge commit
pulled lates changes
.