Commit in order to Pull Stephan Changes
Merge branch 'master' of https://github.com/stephanwilliams/CS-2340-Project