Update README.md
123
client 12.15
Merge branch 'working' into dev

Conflicts:
	README.md
	lab02/Database.java
Merge branch 'dev' of https://github.com/plumer/diki.git into dev

Conflicts:
	.classpath
	lab02/Database.java
client 12.15
Merge branch 'dev' of https://github.com/plumer/diki.git into dev