Merge branch 'master' of /home/darek/PycharmProjects/multiwonszex with conflicts.
3rd screen