график
Merge branch 'client' of github.com:the21/do into client

Conflicts:
	client/childStatus.html