Update file0.txt
Update file1.txt
Merge branch 'i-will-be-merged'
this was forced using the `[master]$ git merge --no-ff i-will-be-merged`