Add Git info

Conflicts:

	test.txt