dog barks even more now
Merge branch 'master' of github.com:EricRoos/git_testing

Conflicts:
	src/dog.rb