folder merge local commit 2
Merge branch 'master' of github.com:JangoBoogaloo/git_doc

Conflicts:
	git_test/merge/merge_dir/f1