Testing branch - adds testing.txt
master adds new file master.txt
adds hotfix for master branch
Merge branch 'testing'