Merge branch 'master' of github.com:mehano/node-passmarket

Conflicts:
	README.md
Merge branch 'master' of github.com:mehano/node-passmarket

Conflicts:
	README.md