updated git_test2.txt, added git_test3.txt
Merge branch 'master' of https://github.com/jwhite007/git_tests

Conflicts:
	git_test2.txt