Added some random stuff
Merge branch 'master' of https://github.com/DBeath/node-test-code

Conflicts:
	callback.js