changes to get the server running on my machine
Fixed merge conflicts
Small js modifications, added framework for periodic chart data sending via websockets
Dirty hacks to get server to send a line of chart data periodically
Merge pull request #13 from walter-cavinaw/Albert

important step to sending data from server