diff --git a/default.sxc b/default.sxc
new file mode 100644
index 00000000..7f53b684
--- /dev/null
+++ b/default.sxc
@@ -0,0 +1,8 @@
+\SB@iwrite {titleidx}{TITLE INDEX DATA FILE}
+\SB@iwrite {authidx}{AUTHOR INDEX DATA FILE}
+\SB@iwrite {titleidx}{Talkin' about the revolution}
+\SB@iwrite {titleidx}{1}
+\SB@iwrite {titleidx}{song2-1.2}
+\SB@iwrite {authidx}{Tracy Chapman}
+\SB@iwrite {authidx}{1}
+\SB@iwrite {authidx}{song2-1.2}
diff --git a/songs/America/A_Horse_With_No_Name.sg b/songs/America/A_Horse_With_No_Name.sg
new file mode 100644
index 00000000..87366dbc
--- /dev/null
+++ b/songs/America/A_Horse_With_No_Name.sg
@@ -0,0 +1,57 @@
+\selectlanguage{english}
+\songcolumns{2}
+\beginsong{A Horse With No Name}[by=America,cov=America,album=America]
+
+  \cover
+  \gtab{Em}{022000}
+  \gtab{D6/9}{200200}
+  \gtab{Em9}{X20002}
+  \gtab{Dmaj9}{XX0220}
+
+  \begin{verse}
+    On the \[Em]first part of the \[D6/9]journey
+    I was \[Em]lookin at all the \[D6/9]life
+    There were \[Em]plants and birds and \[D6/9]rocks and things
+    There were \[Em]sand and hills and \[D6/9]rings
+
+    The \[Em]first thing I met was a \[D6/9]fly with a buzz
+    And the \[Em]sky with no \[D6/9]clouds
+    The \[Em]heat was hot and the \[D6/9]ground was dry
+    But the \[Em]air was full of \[D6/9]sound 
+  \end{verse}
+
+  \begin{chorus}
+    I've \[Em9]been thru the desert on a \[Dmaj9]horse with no name
+    It felt \[Em9]good to be out of the \[Dmaj9]rain
+    In the \[Em]desert you can't \[Dmaj9]remember your name
+    Cause there \[Em]ain't no one for to \[Dmaj9]give you no pain
+    \[Em9]La la la 
+    \[Dmaj9]La la la la la 
+    \[Em9]La la la
+    \[Dmaj9]La la la la la
+  \end{chorus}
+
+  \begin{repeatedchords}
+    \begin{bridge}
+      After \[Em]two days in the \[D6/9]desert sun
+      My \[Em]skin began to turn \[D6/9]red
+      After \[Em]three days in the \[D6/9]desert fun
+      I was \[Em]looking at a river \[D6/9]bed
+
+      And the \[Em]story it told of a \[D6/9]river that flowed
+      Made me \[Em]sad to think it was \[D6/9]dead
+    \end{bridge}
+    \begin{verse}
+      After \[Em]nine days I let the \[D6/9]horse run free
+      Cause the \[Em]desert had \[D6/9]turned to sea
+      There were \[Em]plants and birds and \[D6/9]rocks and things
+      There were \[Em]sand and hills and \[D6/9]rings
+
+      The \[Em]ocean is a desert with its \[D6/9]life underground
+      And the \[Em]perfect disguise \[D6/9]above
+      Under the \[Em]cities lies a \[D6/9]heart made of ground
+      But the \[Em]humans will give no \[D6/9]love
+    \end{verse}
+  \end{repeatedchords}
+
+\endsong
\ No newline at end of file
diff --git a/songs/America/America.jpg b/songs/America/America.jpg
new file mode 100644
index 00000000..66d4165e
Binary files /dev/null and b/songs/America/America.jpg differ
diff --git a/songs/Razorlight/America.sg b/songs/Razorlight/America.sg
index 31be976a..b11ba827 100644
--- a/songs/Razorlight/America.sg
+++ b/songs/Razorlight/America.sg
@@ -1,5 +1,6 @@
 \selectlanguage{english}
 \songcolumns{2}
+<<<<<<< HEAD
 \beginsong{America}
   [by=Razorlight,cov=Razorlight,album=Razorlight]
 
@@ -75,3 +76,101 @@
   \end{verse*}
 
 \endsong
+=======
+\beginsong{America}[by=Razorlight,cov=Razorlight,album=Razorlight]
+
+  \cover
+  \gtab{A}{X02220}
+  \gtab{B}{2:x03330}
+  \gtab{E}{022100}
+  \gtab{D}{xx0232}
+  \gtab{G}{320033}
+
+  \begin{verse}
+    \[A]What a \[B]drag it is
+    The \[E]shape i'm \[A]in
+    \[A]Well I \[B]go out somewhere
+    Then \[E]I come home \[A]again
+  \end{verse}
+
+  \begin{verse*}
+    \[A]I light a \[B]cigarette
+    'Cause \[E]I can't get no \[A]sleep
+    \[A]Theres nothing on the TV \[B]nothing on the radio
+    That \[E]means that much to \[A]me
+  \end{verse*}
+
+  \beginchorus
+    \[A]All my \[B]life  \[E]
+    Watching \[A]America
+    \[A]All my \[B]life \[E]
+    There's panic in \[A]America
+    \[A]Oh Oh \[B]Oh, Oh\[E]
+    There's trouble in \[A]America
+    \[A]Oh Oh \[B]Oh, Oh\[E]
+  \endchorus
+
+  \begin{repeatedchords}
+    \begin{verse}
+      \[A]Yesterday \[B]was easy
+      Happiness\[E] came and \[A]went
+      \[A]I got the \[B]movie script
+      But I \[E]don't know what it\[A] meant
+    \end{verse}
+
+    \begin{verse*}
+      \[A]I light a \[B]cigarette
+      'Cause \[E]I can't get no \[A]sleep
+      \[A]Theres nothing on the TV \[B]nothing on the radio
+      That \[E]means that much to \[A]me
+      \[A]Theres nothing on the TV \[B]nothing on the radio
+      That I \[E]can believe \[A]in
+    \end{verse*}
+
+    \beginchorus
+      \[A]All my \[B]life  \[E]
+      Watching \[A]America
+      \[A]All my \[B]life \[E]
+      There's panic in \[A]America
+      \[A]Oh Oh \[B]Oh, Oh\[E]
+      There's trouble in \[A]America
+      \[A]Oh Oh \[B]Oh, Oh\[E]
+      There's panic in \[A]America
+      \[A]Oh Oh \[B]Oh, Oh\[E]
+    \endchorus
+  \end{repeatedchords}
+
+  \begin{verse}
+    \[A]Yester\[B]day was easy
+    \[D]Yes I got the \[G]news
+    \[A]When you \[B]get it straight, but \[D]stand up you just can't \[G]lose
+    \[A]Give you my \[B]confidence, \[D]all my faith in \[G]life
+    \[A]Dont stand me up
+    \[B]Don't let me down
+    \[E]I need you \[A]tonight
+    \[A]To hold \[B]me,\[E] say you'll \[A]be here
+    \[A]To hold \[B]me,\[E] say you'll \[A]be here
+    \[A]To hold \[B]me,\[E] say you'll \[A]be here
+    \[A]To hold..\[B]  \[E]
+  \end{verse}
+
+  \begin{repeatedchords}
+    \beginchorus
+      \[A]All my \[B]life  \[E]
+      Watching \[A]America
+      \[A]All my \[B]life \[E]
+      There's panic in \[A]America
+      \[A]Oh Oh \[B]Oh, Oh\[E]
+      There's trouble in \[A]America
+      \[A]Oh Oh \[B]Oh, Oh\[E]
+      There's panic in \[A]America
+      \[A]Oh Oh \[B]Oh, Oh\[E]
+    \endchorus
+  \end{repeatedchords}
+
+  \begin{verse}
+    \[A]Tell me how does it \[B]feel\[E] \[A]\rep{4}
+  \end{verse}
+
+\endsong
+>>>>>>> 564a90b1876d5c3bbde61fda3de00ce39e51220a
diff --git a/songs/U2/Achtung-Baby.jpg b/songs/U2/Achtung-Baby.jpg
new file mode 100644
index 00000000..b005b714
Binary files /dev/null and b/songs/U2/Achtung-Baby.jpg differ
diff --git a/songs/U2/One.sg b/songs/U2/One.sg
new file mode 100644
index 00000000..3fe06128
--- /dev/null
+++ b/songs/U2/One.sg
@@ -0,0 +1,48 @@
+\selectlanguage{english}
+\songcolumns{2}
+\beginsong{One}[by=U2,cov=Achtung-Baby,album=Achtung Baby]
+
+  \cover
+  \gtab{Am}{X02210}
+  \gtab{D}{XX0232}
+  \gtab{F}{XX3211}
+  \gtab{G}{320003}
+  \gtab{C}{X32010}
+
+  \begin{verse}
+    \[Am]Is it getting \[D]better \[F]or do you feel the same\[G]
+    \[Am]Will it make it \[D]easier on you now, \[F]you got someone to blame\[G]
+  \end{verse}
+
+  \begin{chorus}
+    \[C]You say \[Am]one love, one life
+    \[F]When it's one need\[C] in the night
+    \[C]One love, \[Am]we get to share it
+    \[F]Leaves you baby if you \[C]don't care for it
+  \end{chorus}
+
+  \begin{repeatedchords}
+    \begin{verse}
+      \[Am]Did I disap\[D]point you \[F]or leave a bad taste in \[G]your mouth
+      \[Am]You act like you never \[D]had love, \[F]you want me to go without\[G]
+    \end{verse}
+    \begin{verse}
+      \[Am]Have you come here for \[D]forgiveness, \[F]have you come to raise \[G]the dead
+      \[Am]Have you come here to \[D]play Jesus, \[F]to the lepers in your \[G]head
+    \end{verse}
+  \end{repeatedchords}
+
+  \begin{bridge}
+    \[C]You say love is a \[Am]temple, love a higher law
+    \[C]Love is a temple, \[Am]love the higher law
+    You \[C]ask me to enter but \[G]then you make me crawl
+    And \[G]I can't be holding \[F]on to what you got \[F]when all you got is hurt
+  \end{bridge}
+
+  \begin{chorus}
+    \[C]One life, but we're \[Am]not the same
+    We get to\[F] carry each other, car\[C]ry each other
+    One \[C] \[Am] \[F] \[C]\rep{2}
+  \end{chorus}
+
+\endsong
\ No newline at end of file
diff --git a/sortindex.pyc b/sortindex.pyc
new file mode 100644
index 00000000..82f03ba1
Binary files /dev/null and b/sortindex.pyc differ