Creating template
Merge branch 'master' of ssh://mabbuquest-mabbu9.rhcloud.com/~/git/mabbuquest

Conflicts:
	package.json
minor debugging
deleted server.js
app port to 8080
port to process variable
added server.js back
try again
try again again
try again3
try again4
trying only connect
making server.js with connect
trying to add mabbuquest server to server.js
need to push config_build.json
config files need to be pushed
trying only websockets
test server on 80 port
Reverted back to working client and 8000 websocket port
using one port