version 2 changes
version 1 change
Merge branch 'Version_2'

Conflicts:
	hello.txt