zad2a na zad2
Merge branches 'master' and 'zad2'