Merge pull request #22 from sushant94/master

Fixed the realtime server
Merged a bit of frontend