Merge branch 'database'

Conflicts:
	todo.txt

Merging todo.txt into the master branch, despite trying to keep it
separate.