commit conflicts fixed
welcome page updates
merge clean up
clear conflicts

Conflicts:
	css/app.css
	partials/items-list.html
	partials/progress-and-plan.html