Modified .gitignore
Merge branch 'master' of https://github.com/tdoshea90/cs1653-2