created database tables
Merge branch 'db'

Conflicts:
	database.db