Commit to GitHub
Merge branch 'master' of https://github.com/JordanStone/CS350Project