Merge branch 'master' of /home/mk/MK/Sprint-1 with conflicts.
Drobne zmeny v nazvoch
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/Sprint-1.iml
	.idea/workspace.xml