kolizja
Merge branch 'master' of https://github.com/KNTGPolygon/Lost-in-chaos

Conflicts:
	source/Main.cpp