be able to show content in the search frame
Merge branch 'master' of https://github.com/BonnieBBS/Calorie_Manager

Conflicts:
	ui/.DS_Store