Revert "test2"

This reverts commit af41ba585af2a550a5acd1509383b286f07e3f7b.

Conflicts:
	hello.txt
sdfs