first commit of commit-basic file
deleted text-commit file from master branch because it shouldn't have been in there
first commit of commit-basic.txt
commit to finish merge