done explaining branching
still talking about branching
Merge branch 'version3'

Conflicts:
	todo.txt