testing
Merge branch 'master' of git://github.com/JumpToFive/NodeTest

Conflicts:
	server.js