commit re
Merge branch 'master' of github.com:hajime0083/git_test

Conflicts:
	test_file2.txt