* Creating hubot repo appropriately
* Fixed conflicts from stupid things I did