CCCritter 3/14
Merge branch 'master' of https://github.com/Macalester-CS124-2013-S/critters
Merge branch 'master' of https://github.com/Macalester-CS124-2013-S/critters