first rocbot commit
Merge branch 'master' of https://github.com/RocHack/treebot

simple merge