prepis na 2.0
Merge branch 'master' of https://github.com/seberm/cryo

Conflicts:
	src/client/main.cpp