queries
scriptsMerge branch 'master' of https://github.com/davidtlee/consensus

Conflicts:
	scripts/queries.rb
Merge branch 'master' of https://github.com/davidtlee/consensus