Add more echos
lots of echos
comments about tests
Merge branch 'lotsofecho'
base files for lab1
Daniel Hanlen > Submitting lab1
Daniel Hanlen
added my animal
Added a spider because everyone hates spiders
Merge branch 'master' of https://github.com/karcaw/cpts224_2014
added some animals
devlyn awesome animal
animals
Merge branch 'master' of https://github.com/karcaw/cpts224_2014

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

Conflicts:
	animals
Animals!
Merge branch 'lab1'
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
Merge branch 'master' of https://github.com/karcaw/cpts224_2014

Conflicts:
	animals