Merge pull request #1 from gungungun93/master

test finish
Add Git info
Merge remote-tracking branch 'origin/master' into Vun

Conflicts:
	test.txt