almost lost this file :S
Merge branch 'master' of github.com:misko/petbot
Merge branch 'master' of github.com:misko/petbot