going through the tutorials
gMerge branch 'master' of github.com:misko/petbot