levjj/ualbertabot — pull request #4 by dlazell (2014-11-17 18:24:22+00:00)
Title: Addtobot

Fixed merge conflicts, other stuff