nice comment
second commit
file removal
yet an other commit
Revert "file removal"

This reverts commit 1ef9fbfbe7aab75ead70a2fe1a74332fffe5486f.
Revert "yet an other commit"

This reverts commit 79a4522beff5c815c9f45bbf71d53200a5bdaa1a.
more changes again
Revert "more changes again"

This reverts commit 238ecdd987d8f4eb48aa843c062feeb4083943d7.
Revert "Revert "more changes again""

This reverts commit fe06be488dbef96d7256ffb6f27669f56a79f0b5.
Revert "more changes again"

This reverts commit 238ecdd987d8f4eb48aa843c062feeb4083943d7.
 thid file
delete file3
bam
blabla
Merge remote-tracking branch 'origin/master'