merged two app files
started socket.io integration