Maybe fixed knapsack this time?
Merge branch 'master' of github.com:czchapma/my-meal-plan

Conflicts:
	static/js/mydininglog.js