update
Merge branch 'master' of https://github.com/hellomaya/db-test

Conflicts:
	README.md