unified textarea and send btn
Merge remote-tracking branch 'origin' into integrate

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

Conflicts:
	views/socketBoard.ejs