rebasing with project files for IDE
Merge branch 'master' of https://github.com/shimon0505004/CS414_ColoState