Update README.md
blah
blah again
adding cats
Merge branch 'Macariom01-master'
Merge branch 'master' of https://github.com/ronaldpetty/horsefarm

Conflicts:
	README.md
fixing merge conflict with github pull request
Adding baby pigs
Merge https://github.com/ronaldpetty/horsefarm

Conflicts:
	README.md
fixing merge conflict
Merge branch 'espears-master'
Merge pull request #7 from keomany/master

Adding baby pigs
Merge branch 'master' of https://github.com/ronaldpetty/horsefarm

Conflicts:
	README.md