merging
Merge branch 'master' of github.com:shuky19/lab-project

Conflicts:
	example.ass
	example.obj
merge
last fixes