Initial Commit
added node.js server code
merge conflict