Added testfile to master branch
Merge branch 'testbranch'

Conflicts:
	testfile
Cleared testfile contents
Modified testfile: added ls -la contents to it