Added handling for incoming requestTrackList from client on connection.
Merge branch 'master' of github.com:smschrader/fmrhackathon

Merge Greg's main.js and Ishan's websocket_handler.js changes together.

Conflicts:
	server_js/websocket_handler.js