more fixes for bad merge
Merge branch 'master' of https://github.com/lehn0058/csci5125-geocaching