Zmian Tomka 3
Merge remote-tracking branch 'origin/tomek'
Merge remote-tracking branch 'origin/master' into krzysiek