merged Merge branch 'master' of github.com:krimple/angular-socketio-chat
merged
Merge branch 'master' of github.com:krimple/angular-socketio-chat

mleanos/angular-socketio-chat,edahood/angular-chat-demo,ther12k/angular-socketio-chat,jinxuan/angular-socketio-chat,meticulo3366/angular-socketio-chat,jinxuan/angular-socketio-chat,chintan9/angular-socketio-chat,meticulo3366/infinite_hangman,edahood/angular-chat-demo,meticulo3366/infinite_hangman,chintan9/angular-socketio-chat,ther12k/angular-socketio-chat,krimple/angular-socketio-chat,mleanos/angular-socketio-chat,krimple/angular-socketio-chat,meticulo3366/angular-socketio-chat,meticulo3366/infinite_hangman