Merge pull request #2 from amsheehan/alex

WebSocket integration
modal