change in dog branch
new change
even more changes
Merge branch 'dog'

Conflicts:
	README