progress-and-plan.html update
Merge branch 'master' of https://github.com/prakashgbid/www

Conflicts:
	.DS_Store
	css/app.css
	css/topcoat.css
	img/icons/check mark_nursery.png
	img/icons/check_mark_nursery.png
	img/icons/checkmark_nursery.png
	partials/items-list.html