Started to create the database design.
Added database design first draft.
Fixed conflicts.

Conflicts:
	research/thot-project.ep