updated description for sql_query
fixing merge issue

Merge branch 'master' of https://github.com/rparrish/RPamisc

Conflicts:
	README.md