I am commiting these changes and it wants me to tell you about them. My file
is a rhino. =D
Merge branch 'master' of https://github.com/karcaw/cpts224_2014

Conflicts:
	animals
Comment
comment: Merge branch 'master' of https://github.com/karcaw/cpts224_2014

Conflicts:
	animals