del test.txt
add test.txt
Merge branch 'master' of https://github.com/passerbyid/GitClass

Conflicts:
	test.txt