chaged_from git_test_1
Merge branch 'master' of https://github.com/daehyun-p/gittest

Conflicts:
	git_test_1_new file