Add Git info
add file test

Conflicts:

	test.txt