Initial commit
Merge branch 'master' of github.com:quile/caribou-query

Conflicts:
	.gitignore
	README.md
Fixed merge