Initial commit
test commit
delete file
test add file
olo
olo
commit test 2
asd

 branch 'gh-pages'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.