pull test
Merge branch 'master' of http://github.com/andreakwon/node-test

Conflicts:
	test2.js
test
Merge branch 'master' of http://github.com/andreakwon/node-test

Conflicts:
	test2.js