blaba
Merge branch 'master' of https://github.com/cartisan/knext

Conflicts:
	watson/main.py
vortrag1