drobne
Merge branch 'master' of https://github.com/groovy354/KCK_3B

Conflicts:
	js/controller.js