test git branch
add file in  testing branch
Merge branch 'testing'

Conflicts:
	study/git_study.txt