merge
Merge branch 'master' of https://github.com/VladislavG/test

Conflicts:
ad.idea/workspace.xml
Display legends
Legend added