working
Merge branch 'master' of github.com:lob/node-console

Conflicts:
	README.md