Commit to test conflicts
Conflicting changes
Merge branch 'first_branch'

Conflicts:
	git_branching.md
add images
new conflicts
newer conflicts
Even more conflicts
Branching almost done