Fixed gitignore file
Merge branch 'master' of https://github.com/claydiffrient/cs313
Merge branch 'master' of https://github.com/claydiffrient/cs313
Added remote changes made