The first commit.  See the README for more information.
Merge branch 'recover'

Conflicts:
	README
	db.py
	db_test.py
Added revision for first commit to README.