mammalbot
Merge pull request #6 from mnewberry/master

mammalbot