Testing
Merge branch 'chatitude-server' of https://github.com/CharlesMilam/chatitude into chatitude-server

Pull from Charles
Testying