add another commit to a branch w/ a separate branch
Merge branch 'master' into branch-ii

Conflicts:
	branch.md
Merge branch 'branch-ii'