test now failing (instead of errors) for hypothesizeLocation()
dogTeam hypothesizeLocation test now passing
minimal merge conflicts resolved