Merge

folk/folk.csv

@@ -31,7 +31,7 @@ Robert Bloodworth (Bob Bloodworthy),Bloodworth,1,,i/bobb.jpg,,,,,,,,,,,,,,,,,,,1
 Ryan Boultbee,Boultbee,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,
 John Bowers,Bowers,,,i/jab.jpg,,,1,1,1,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 Holly Bradley,Bradley,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,1,1,1,1,,,,,,
-Callum Braithwaite,Braithwaite,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,
+Callum Braithwaite,Braithwaite,1,,i/callum.jpg,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,
 George Breley,Breley,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,,
 Michael Brigham,Brigham,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
 Dave Brindle,Brindle,,,l/daveb.htm,,,,,,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

years/2012/logbook.html

@@ -962,7 +962,7 @@ Had an explore, realised the 1978 survey has the wrong angle for the side passag
 <div class="trippeople">OllyB, <u>Jenny</u>, Stuart B</div>
 <div class="triptitle">Eish&ouml;hle Tourist Trip</div>
 
-<p>[Accompanied by non-expo  Terry & Annette.]
+<p>[Accompanied by non-expo  Terry Betts (Olly's father) & Annette.]
 <p>Walked down from our bivi to meet the others at the Stogerweg junction. Walked (slowly) to Eish&ouml;hle. It was very hot and took hours, eventually got to the Ice Tunnel entrance which had less ice than Olly remembered. The bolts were almost out of reach! All got down and admired the ice.</p>
 
 <p>On the way back removed the deviation hangs from the old 40A bivi. It took a long time, and we got back to the car as it got dark. Stuart kindly took Terry + Annette back to basecamp, while we walked back to our bivi. Got caught in a big thunderstorm - hail stones nearly 1 cm &Oslash; - fortunately we had helmets on!</p>

years/2014/logbook.html

@@ -536,7 +536,6 @@ Route finding through Knossos/Star Wars/Tower Blocks proved to be a bit more tri
 <div class="trippeople"><u>Holly</u> &amp; Callum, Joe</div>
 <div class="triptitle">107 - Land of Confusion</div>
 
-<p>[Logbook clearly says "Callum" but there is no one of that name registered. ]
 <p>The weather was rubbish - rain, rain, rain. It was understood that the large pitch into China would be too wet to descend, so we went in to try &amp; find a new way in, in the Land of Confusion. We headed over the big pitch &amp; into LoC. Here one drops a short pitch (~6m or so), then climbs up the same height to on-going passage on the other side.</p>
 <p><u>Note:</u> at the bottom of this pitch is another pitch - dry (13-LC-16A). Perfect for someone who wants bolting practice. On the main passage, Joe ran ahead to scope out the leads (pitches) that are understood to also lead to China. Joe found lead 13-LC-2C to be dry, so we attempted to rig here. Unfortunately all the rock was cheese. Eventually, after a lot of trying, we decided that it would be a project that needed more work &amp; wouldn't be worth it. So we headed out, but rigged a traverse on the rift somewhere between 'Coldest Place on Earth' and 'Restless' as follows:</p>
 <p><img src="./logbkimg14.png" alt="Rigging sketch for rift somewhere between 'Coldest Place on Earth' and 'Restless'"></p>