removed plural names
fixed merge conflictMerge branch 'master' of github.com:eventEmitter/ee-mysql-connection

Conflicts:
	package.json
bugfixes