jg
Merge branch 'camilo_pc_fernando' of https://github.com/octaedro/chat_node into camilo_pc_fernando
asdasd