test merge vs commit
Merge pull request #1 from haafi/master

test
Merge pull request #2 from Zacharias030/master

t1