TestSceneGeneration
Merge branch 'master' of https://github.com/adamzimny/prince.git
test prekazek
Merge branch 'master' of https://github.com/adamzimny/prince.git
Fighting Knight
Merge branch 'master' of https://github.com/adamzimny/prince.git
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore