Merge branch 'master' of https://github.com/CSUChicoSoftwareEngineering/eggbeater

Made corrections