Merge branch 'master' into engine
troche kodu
implementacja Duel.h
merge z engine