done walking dog
still walking dog
Merge branch 'version3'

Conflicts:
	todo.txt