can look at past hikes now
Merge remote-tracking branch 'origin/master'