camels live in the desert
Merge pull request #1 from kevlaria/master

I want to create a conflict!
making a conflict
Too bad Kevin!

Merge branch 'master' of github.com:sarahelizgray/mammals

Conflicts:
	README.md
commit
master commit
oijewf
mawef
oiwef