DI 2
Merge branch 'master' of https://github.com/HonzaMac/prcek

Conflicts:
	.idea/workspace.xml