Merge branch 'master' of https://github.com/Adam27/volia

Conflicts:
	.idea/workspace.xml