initial
Merge branch 'master' of https://github.com/dkoele/NodeJSTest

Conflicts:
	server.js
added pi