Merge branch 'master' of https://github.com/froufroux91/trollconsole

Conflicts:
	index.html
	js/socketController.js
Merge branch 'master' of https://github.com/froufroux91/trollconsole

Conflicts:
	index.html
	js/socketController.js