Merge pull request #1 from mrubel92/master

Modify Test
Modified .gitignore
Merge branch 'master' of https://github.com/tdoshea90/cs1653-2
Testing on Desktop