changed local host to pinky
Merge branch 'master' of https://github.com/davidborden/chatroom