[CT-19] For Dima
[CT-19] For Dima
Merge branch 'vadim' of github.com:Power-Pill/lolshto into vadim

Conflicts:
	CoonTrip-desktop/data/images/bricklogic.png
	CoonTrip-desktop/data/images/coontrip.png
	CoonTrip-desktop/data/images/evil1.png
Merge pull request #13 from Power-Pill/vadim

[CT-19] For Dima