files.txt
Merge branch 'master' of https://github.com/emmacalintal/HelloWorld
Added masterfile.txt
Added testingfile.txt
Merge branch 'testing' of https://github.com/emmacalintal/HelloWorld into testing