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

Conflicts:
	.idea/workspace.xml
charts exactly stacked