my first commit
Test

as
Merge branch 'master' of https://github.com/mfdiaspinto/PriNode

Conflicts:
	PriNodeServer/PriNodeServer/server.js