Added in object setTochka(int)
Merge branch 'master' of https://github.com/BulSV/Zatochka

Conflicts:
	include/object.h
	src/object.cpp