some changes
Merge branch 'master' of https://github.com/Slicey4/homework_3

Conflicts:
	data/POSdb.lck
	data/POSdb.log
	data/POSdb.properties