Merge branch 'master' of git://git.lohrun.net/songbook

Conflicts:

	songs/Cat_Stevens/My_Lady_d_Arbanville.sg
	songs/Graeme_Allwright/Petites_boites.sg
	songs/Simon_Garfunkel/Scarborough_Fair.sg

Cat_Stevens/My_Lady_d_Arbanville.sg

@@ -52,4 +52,4 @@ I'll always be with you
 This rose will never die \rep{2}
 \endverse
 
-\endsong
+\endsong

Pixies/Where_Is_My_Mind.sg

@@ -0,0 +1,36 @@
+\songcolumns{1}
+\beginsong{Where Is My Mind}[by=Pixies]
+
+\gtab{Mi}{022100}
+\gtab{Do#m}{4,X13321}
+\gtab{La&m}{4,133211}
+\gtab{La}{5,133211}
+\gtab{Do#}{4,X13331}
+\gtab{Si}{2,X13331}
+
+\beginverse
+With your \[Mi]feet in the air and your \[Do#m]head on the ground \[La&m] \[La]
+\[Mi] Try this trick\[Do#m] and s\[La&m]pin it   Ye\[La]ah,
+\[Mi] Your head will coll\[Do#m]apse but there's \[La&m]nothing in it
+And you'll \[La]ask yourself
+\endverse
+
+\beginchorus
+\[Mi]Where is my \[Do#m]mind?
+\[La&m] Where is my mind?\[La]
+\[Mi]Where is my \[Do#m]mind?  \[La&m] \[La]
+\endchorus
+
+\beginverse
+\[Mi]Way \[La&m]out in the \[La]water see it \[Lam]swimmin' \[Do#] ... \[Si]
+\endverse
+
+\beginverse
+I was swimmin' in the Carribean
+Animals were hiding behind the rock
+Except the little fish
+But they told me, he swears
+Tryin' to talk to me to me to me
+\endverse
+
+\endsong