Merge branch 'master' of https://github.com/Lydia-Wallgren/dinnerplanner-html

Conflicts:
	js/view/selectView.js
merge