refactor
Merge branch 'master' of https://github.com/rexos/kokko

Conflicts:
	public/index.html