Finish branching
Still adding lines
Merge branch 'version3'

Conflicts:
	todo.txt
Adding last line
Merge pull request #1 from jabbowaki/version4

Version4 Adding an item to do list