dunno
Merge branch 'master' of https://github.com/mxtdi/Assesment

Conflicts:
	db-derby-10.1.2.1-bin/Database/derby.log
	db-derby-10.1.2.1-bin/Database/testdb/db.lck
	db-derby-10.1.2.1-bin/Database/testdb/log/log.ctrl
	db-derby-10.1.2.1-bin/Database/testdb/log/log1.dat
	db-derby-10.1.2.1-bin/Database/testdb/log/logmirror.ctrl
	db-derby-10.1.2.1-bin/Database/testdb/seg0/c470.dat
	db-derby-10.1.2.1-bin/root/nbproject/private/private.properties
	db-derby-10.1.2.1-bin/root/nbproject/private/private.xml
dunno