Committing chnages for hotfix.
Edited test file in master branch.
Merge branch 'hotfix'

Conflicts:
	testapp/testfile.txt