Commiting editted file from dev_work branch
Changing more files on dev_work branch
merging
Editting Hello World on hotfix
Merge branch 'hotfix1'

Conflicts:
	Hello_World.txt
merging
Merge branch 'hotfix1'