Merge changes from 2nd half of expo.

Merge folk.csv changes for 2 attempts.

years/2006/logbook.html

@@ -836,7 +836,7 @@ The path was very good, and went down the north-ish side of the Vord, past 199,
 <div class="trippeople"><u>Jenny Black</u>, Olly Betts </div>
 <div class="triptitle">76: Waste of Time</div>
 
-<p>Couldn't decide whether to look at Razor Advance, the Time and Space pitch or the 1970's Route. Picked Time and Space as it was nearest. Olly bolted down as I fed out the 150m rope from the big bag. Surprisingly it only needed 2 bolts (as well as the pitch head it shares with the pendule / traverse rope). The 150m rope was very fast - even with a breaking krab I didn't need to hold the handle in on my stop at all .. sadly after 31m the pitch got very drippy and ended - a tight slot dropped away in the floor but wasn't very big. It may be passable but from its position looks like it will [?trivially? or finally?] appear in a too tight inlet in Keg Series. This ptich is called "Waste of Time". So that lead was ticked off in a very dull way. Surveying and derigging got us back to the Tap Room where we set off to rig down Spent Ledge stuff. I got very cold (partly cos I had spent the time Olly bolted Waste of Time sitting shivering) cos Spent Ledge is really draughty. Also, [?but?, ?bit?] brain thought it was bedime as it was nearly midnight. I got very cold and useless and made Olly turn round. Eventually prussiking warmed me up and I felt better, but I have never been that cold before and it was crap.</p>
+<p>Couldn't decide whether to look at Razor Advance, the Time and Space pitch or the 1970's Route. Picked Time and Space as it was nearest. Olly bolted down as I fed out the 150m rope from the big bag. Surprisingly it only needed 2 bolts (as well as the pitch head it shares with the pendule / traverse rope). The 150m rope was very fast - even with a breaking krab I didn't need to hold the handle in on my stop at all .. sadly after 31m the pitch got very drippy and ended - a tight slot dropped away in the floor but wasn't very big. It may be passable but from its position looks like it will trivially appear in a too tight inlet in Keg Series. This ptich is called "Waste of Time". So that lead was ticked off in a very dull way. Surveying and derigging got us back to the Tap Room where we set off to rig down Spent Ledge stuff. I got very cold (partly cos I had spent the time Olly bolted Waste of Time sitting shivering) cos Spent Ledge is really draughty. Also, my brain thought it was bedime as it was nearly midnight. I got very cold and useless and made Olly turn round. Eventually prussiking warmed me up and I felt better, but I have never been that cold before and it was crap.</p>
 
 <div class="timeug">T/U: 9 1/4 hrs</div>
 
@@ -872,7 +872,7 @@ The path was very good, and went down the north-ish side of the Vord, past 199,
 <div class="trippeople"><u>Jenny Black</u>, Olly Betts </div>
 <div class="triptitle">76 Hall of the Greene King  </div>
 
-<p>Got underground late (3.40pm!) due to moving the tent back out of the bivi cave cos it is wetter there, and much effort at lighting Olly's now broken stove. Down to Spent Ledge where Olly rigged down to last year's end. Rigged the next little pitch on a wide Y-hand to a 1970's spit (in hindsight a new bolt further along will be significantly better). The water drops down lower in the rift, but the way on is up a metre to a traverse along ledges to a wedged in boulder which rocks back and forth if you stand on it ... Dropped down a few metres on a 1970's spit to a ledge. Olly put in a back up bolt and moved over the pitch. Used the 1970's hang bolt as a deviation to get to a ledge a few metres down (this isn't in the best place). Had a nice Y-hang here, and Olly abseiled down for ages. Pitch wasn't as free hanging as we expected - it got a deviation on a natural, and needs rigging better as currently you need to fend off with your feet near the bottom. Then a rebelay for a few metres down to the Balcony. The Greene King pennant was still there, though a bit damaged with age. Olly put in a bolt and we abbed to the floor. Initially we were a bit overwhelmed by all the big boulders - some in the floor, some wedged above as rock bridges. The way on is up the boulder pile, under a few rock bridges and back down the other side (our [?hanging?] Boulder Pitch) which now has 2 bolts, and the rigging starts higher. Followed the passage down over and under boulders and heard water levels rise significantly (apparently a hailstorm on the surface). Decided it was probably an evening storm and so water levels would hopefuly drop after a while. Figured the pitches might well be quite wet, so decided to survey lots at this level so the water could decrease, and pospone surveying the pitch. Continued down the passage to a four way junction. Left appears to be the 1979 route to the stream cuts down and disappears, but you can traverse on ledges above to reach a 17m pitch (which looks nice but we didn't descend). Straight on must be the 1978 route and is initially dry muddy passage to a junction at a pitch (which again we didn't drop). Right is an inlet from above. Surveyed all this, which took a while, back up to the hang bolt from the Balcony. Water levels stil high-ish, but nowhere near as bad as I expected, and the worst bit was the Tap Room. Olly [?having?] carried the drill up the bottom half and me the top half of the cave. Wished we had more water bottles with us - had left one in Strangeways and one in Boulder Chamber, could have done with water lower down. Just made it out with 30 mins to spare before our 8am callout!</p>
+<p>Got underground late (3.40pm!) due to moving the tent back out of the bivi cave cos it is wetter there, and much effort at lighting Olly's now broken stove. Down to Spent Ledge where Olly rigged down to last year's end. Rigged the next little pitch on a wide Y-hand to a 1970's spit (in hindsight a new bolt further along will be significantly better). The water drops down lower in the rift, but the way on is up a metre to a traverse along ledges to a wedged in boulder which rocks back and forth if you stand on it ... Dropped down a few metres on a 1970's spit to a ledge. Olly put in a back up bolt and moved over the pitch. Used the 1970's hang bolt as a deviation to get to a ledge a few metres down (this isn't in the best place). Had a nice Y-hang here, and Olly abseiled down for ages. Pitch wasn't as free hanging as we expected - it got a deviation on a natural, and needs rigging better as currently you need to fend off with your feet near the bottom. Then a rebelay for a few metres down to the Balcony. The Greene King pennant was still there, though a bit damaged with age. Olly put in a bolt and we abbed to the floor. Initially we were a bit overwhelmed by all the big boulders - some in the floor, some wedged above as rock bridges. The way on is up the boulder pile, under a few rock bridges and back down the other side (Over-hanging Boulder Pitch) which now has 2 bolts, and the rigging starts higher. Followed the passage down over and under boulders and heard water levels rise significantly (apparently a hailstorm on the surface). Decided it was probably an evening storm and so water levels would hopefuly drop after a while. Figured the pitches might well be quite wet, so decided to survey lots at this level so the water could decrease, and pospone surveying the pitch. Continued down the passage to a four way junction. Left appears to be the 1979 route to the stream cuts down and disappears, but you can traverse on ledges above to reach a 17m pitch (which looks nice but we didn't descend). Straight on must be the 1978 route and is initially dry muddy passage to a junction at a pitch (which again we didn't drop). Right is an inlet from above. Surveyed all this, which took a while, back up to the hang bolt from the Balcony. Water levels stil high-ish, but nowhere near as bad as I expected, and the worst bit was the Tap Room. Olly [?having?] carried the drill up the bottom half and me the top half of the cave. Wished we had more water bottles with us - had left one in Strangeways and one in Boulder Chamber, could have done with water lower down. Just made it out with 30 mins to spare before our 8am callout!</p>
 
 <div class="timeug">T/U: 15 1/2 hours</div>
 

years/2016/index.html

@@ -12,10 +12,14 @@
 <li><a href="stuffbought.html">Things bought 2016</a></li>
 </ul>
 <p><span style="font-weight: bold;">Post-Expo Documentation</span></p>
-<div>
+<ul>
+<li><a href="/expofiles/surveyscans/2016/">Survey scans</a></li>
+<li><a href="stuffleftattopcamp.html">Stuff left at top camp</a></li>
+<li><a href="stuffleftatbasecamp.html">Stuff left at base camp</a></li>
+<li><a href="thingsfor2017.html">Things needed for 2017</a></li>
+<li><a href="logbook.html">Logbook</a> (incomplete)</li>
 <li><a href="rescue_debrief.html">Rescue Debrief 2016</a></li>
 </ul>
-</div>
 <hr />
 <!-- LINKS -->
 </body>

years/2016/logbook.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>2016 Expo Logbook</title></head>
+<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
+
+<body id="logbk">
+<h1>CUCC Logbook 2016</h1>
+<!--fragment for each trip --
+<div class="tripdate" id="t2015-08-">2015-08-</div>
+<div class="trippeople"><u></u></div>
+<div class="triptitle"></div>
+<p></p>
+<div class="timeug">T/U: </div>
+--end of fragment-->
+
+<div class="tripdate" id="t2015-07-07a">2015-07-07</div>
+<div class="trippeople"><u>Name1</u>, Name2</div>
+<div class="triptitle">Cave name - ###</div>
+<p> Example entry</p>
+<!<img src="logbkimg01.jpeg" alt="sketch of stick-man luke and 'fuckoff bit of snow' hovering in pitch">>
+<div class="timeug">T/U: #hrs</div>
+
+
+</html>
+</body>

years/2016/stuffbought.html

@@ -3,15 +3,34 @@
 
 <h2>Food</h2>
 <ul>
-<li>test</li>
+<li>200 curries</li>
+<li>7kg Cous Cous</li>
+<li>208 soups</li>
+<li>7kg oats</li>
+<li>4kg milk powder</li>
+<li>4kg mash</li>
+<li>4kg hot choc</li>
+<li>2kg sultanas</li>
+<li>120 choc bars</li>
 </ul>
 
 <h2>Caving gear</h2>
 <ul>
-<li>test</li>
+<li>17 bottles nail polish</li>
+<li>20 pencils</li>
+<li>200m Equirial 9mm </li>
+<li>200m Equirial 10mm </li>
+<li>100m Equirial 11mm </li>
+<li>20 ring hangers</li>
+<li>30 bend hangers</li>
+<li>3 AV 35L tackle bags</li>
+<li>500 Hilti HKDs</li>
+<li>2 drill bits</li>
+
 </ul>
 
 <h2>Camping gear</h2>
 <ul>
-<li>test</li>
+<li>4 white board markers</li>
+<li>2 permanent markers</li>
 </ul></body></html>

years/2016/stuffleftatbasecamp.html

@@ -0,0 +1,17 @@
+<html><head><title>Stuff left at base camp</title></head><body>
+<h1>Stuff left at base camp 2016</h1>
+
+<h2>Food</h2>
+<ul>
+<li>test</li>
+</ul>
+
+<h2>Caving gear</h2>
+<ul>
+<li>test</li>
+</ul>
+
+<h2>Camping gear</h2>
+<ul>
+<li>test</li>
+</ul></body></html>

years/2016/stuffleftattopcamp.html

@@ -0,0 +1,17 @@
+<html><head><title>Stuff left at top camp</title></head><body>
+<h1>Stuff left at top camp 2016</h1>
+
+<h2>Food</h2>
+<ul>
+<li>test</li>
+</ul>
+
+<h2>Caving gear</h2>
+<ul>
+<li>test</li>
+</ul>
+
+<h2>Camping gear</h2>
+<ul>
+<li>test</li>
+</ul></body></html>

years/2016/thingsfor2017.html

@@ -0,0 +1,8 @@
+<html><head><title>Things for 2017</title></head><body>
+<h1>Things for 2017</h1>
+<ul>
+<li>test1</li>
+<li>test2</li>
+</ul>
+
+</ul></body></html>