cos2
Merge origin/master

Conflicts:
	mojagrubaryba.cc
	mojagrubaryba.h