Added filetwo.txt
Merge branch 'master' of https://github.com/Hacsev/git-tut

Conflicts:
	filetwo.txt