AHHHHH
last
Testa
Merge branch 'master' of http://github.com/hellonicolas/BullyBot-Hubot

Conflicts:
	node_modules/redis/package.json
fix
aaaaaaa
a
b
hi
c
d
e
MORE
ok
aaaaa
adadfdds
sdfsfsdfs
jjj