Local file change commit
Merge branch 'master' of github.com:JangoBoogaloo/git_doc

Conflicts:
	git_test/merge/merge_dir/f1
	git_test/merge/merge_dir/f2
	git_test/merge/merge_dir2/f3
	git_test/merge/merge_dir2/f4