-4 rida main.js-ist
Merge branch 'master' of https://github.com/t2t2/k16

Conflicts:
	public/js/main.js