levjj/ualbertabot — pull request #3 by dlazell (2014-11-17 17:12:02+00:00)
Title: Addtobot

Fixed merge conflicts