add test file to git_test reposity
add hello to git_test
add file haha to git_test
add haha2 to git_test
modify test
modify test
Merge branch 'dog'

Conflicts:
	test