Work on Image transmission
Merge branch 'master' of https://github.com/Lander/WebSocketTest

Conflicts:
	js/main.js
Merge branch 'master' of https://github.com/Lander/WebSocketTest