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

* version3:
  Done explaining branching

Conflicts:
	todo.txt