Dog was fed
Dog is going to be fed
Merge branch 'version3'

Conflicts:
	todo.txt