added feature2.txt
modified feature2.txt
modified first.txt
modified first.txt
added feature3.txt
modified feature3.txt
Merge branch 'feature3'
modified first.txt
Squashed commit of the following:

commit 1b0b045b9b38241aad1d7dd189e23acbf7d7d97f
Author: Toni Pivcevic <t.pivcevic@gmail.com>
Date:   Tue Nov 5 00:05:33 2013 +0100

    modified feature4.txt

commit ea642af374eb404e715a33aa88c38d6ce5a40965
Author: Toni Pivcevic <t.pivcevic@gmail.com>
Date:   Tue Nov 5 00:05:08 2013 +0100

    added feature4.txt