app
Merge branch 'master' of https://github.com/jardjys/jardjys.github.io

Conflicts:
	app.html
kj
nutrikids added
Merge branch 'master' of https://github.com/jardjys/jardjys.github.io

Conflicts:
	app.html