changes the values 3.txt
Merge branch 'master' of http://github.com/coder2013/gitDemo

Conflicts:
	3.txt