Done explaining branching
Still talking about branching
Merge branch 'version3'

Conflicts:
	todo.txt