Modified for MASTER branch
Added new file as part of hotfix

See the text in the file
Comments added to master
Merge branch 'Hotfix'
Add more to master
Initial checkin
Edited in dev branch
Modified in MASTER branch
Merge branch 'dev'

Conflicts:
	test.java