tell us the darkness
smaller history
smaller history better
fix classname
merge
Merge pull request #38 from bhelx/darkness

tell us the darkness
use v2 of mtgox ticker; make predicates actually work.
startup stuff
trim whitespace
FUCK
Added !zoidberg
Readme addition for !zoidberg
Merge pull request #39 from csampson/emoticon_controller

Added !zoidberg
Merge pull request #40 from jnwheeler44/master

Fixes twitter status grabs
fix these hardcoded channel messages
Merge branch 'master' of github.com:mculp/chunkybot

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge pull request #41 from jnwheeler44/master

Adds Sam Hills Acronyms
Updated README.md and added to meme_generator.rb
Love,
Radar
Regards,
Radar
k