initial project version
fixes
Merge remote-tracking branch 'origin/fixes'
rozwiazany konflikt