web
Merge branch 'master' of https://github.com/ptsankov/bellog

Conflicts:
	src/runWeb.py