some changes
Merge branch 'master' of github.com:Lipotam/SiFO_kurs_project

Conflicts:
	SiFO_kurs_project.qsf