added animal type
Merge branch 'master' of https://github.com/jimboninja/regextest

Conflicts:
	src/com/jimboninja/animal/Mammal.java