test2 modified again
Merge remote-tracking branch 'Test/master'

Conflicts:
	test2.txt
than changes.
Merge branch 'master' of github.com:pulse-than/test

Conflicts:
	test2.txt