23
Merge branch 'develop' of https://github.com/songziming/hippocampus into develop

Conflicts:
	db.sqlite3