PUSHING BROKEN CODE
Merge branch 'master' of https://github.com/LadyNorm/chatitude