Merge branch 'master' of git://github.com/schmunk42/database-command

Conflicts:
	README.md