Update daily logbook
Merge branch 'master' of https://github.com/tianboyand/project-tkppl

Conflicts:
	public/index.html