this works
Merge branch 'master' of https://github.com/Smokebird/CS-365-final-project