Merged package.json from master
Got basic server connection running
Merging in basic server