temp /add
ok
estate
Merge branch 'master' of https://github.com/jhanlos/akademy

Conflicts:
	alldata.h2.db
	alldata.lock.db