Make Inputs.io play nice with pull requests ;)
Merge branch 'master' of https://github.com/WhiskTech/whiskchat-server