changed SSL to false
Merge branch 'master' of https://github.com/nkashyap/ConsoleJS

Conflicts:
	.idea/workspace.xml
commented out prettify
add forceConnect in socket.js and also added global error handler
project files
Merge branch 'master' of https://github.com/nkashyap/ConsoleJS

Conflicts:
	.idea/jsLinters/jshint.xml
	.idea/libraries/sass_stdlib.xml
	.idea/misc.xml
	.idea/workspace.xml
	ConsoleJS.iml