initial commit
Merge branch 'master' of https://github.com/jpcastillo/chathack

master is ahead of local branch