database
database
Merge branch 'master' of https://github.com/lombric/BRIC

Conflicts:
	doc/test.docx