Homework 6 final project
Merge branch 'master' of https://github.com/andrepeedosaar/Tarkvaratehnika

Conflicts:
	data/POSdb.log
	task1/data/POSdb.script
Final project merging