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

Conflicts:
	data/POSdb.log
Merge branch 'master' of https://github.com/Slicey4/homework_3