updated from geogg122
Merge branch 'master' of https://github.com/profLewis/geogg122