first integration. just the look
integrate stage 1 complete. All things still sort of work
Merge remote-tracking branch 'origin/master' into integrate
temporary push to let muneer pull
:
changed main icon
view changes
Update hyperlinks
unified textarea and send btn
changes
Merge remote-tracking branch 'origin' into integrate

Conflicts:
	views/socketBoard.ejs
Join user table for all get APIs
Merge branch 'master' of https://github.com/BenMQ/laughing-avenger into integrate

Conflicts:
	views/socketBoard.ejs
temp hack for masterarr
Merge remote-tracking branch 'origin/master' into integrate
Add HTML escaping for tags
Merge remote-tracking branch 'origin/master' into dev/db-api
merged with master. Unified textarea
Painstaking conflict solving mergin
Merge remote-tracking branch 'origin/integrate' into integrate

Conflicts:
	views/socketBoard.ejs
css and ejs , stable
Merge remote-tracking branch 'origin/integrate' into integrate

Conflicts:
	views/socketBoard.ejs