Alex Tanti
Merge branch 'master' of https://github.com/webitstudios/node-sqoop
ok

Conflicts:
	lib/data.js