Merge branch 'master' of https://github.com/ericpoe/schrodinger

Conflicts:
	lib/Critter/Cat.php
	tests/unit/Critter/CatTest.php
Merge branch 'master' of https://github.com/ericpoe/schrodinger