circles
Merge branch 'master' of https://github.com/jancajthaml/sgloi13

Conflicts:
	source/cpp/data.h