client remove conflict message
database construct function
again
Merge branch 'dev' into working
database + insert entry & user
entry + getKeyword()
Merge branch 'dev' of https://github.com/plumer/diki into dev

Conflicts:
	lab02/Client.java