please work. updating cs360 project 1
Merge branch 'master' of https://github.com/EthanSchatz/SchoolCode.git