gitignore changed somehow
Merge branch 'master' of https://github.com/CS590SA/Project
Merge branch 'master' of https://github.com/CS590SA/Project