Health Goal Suggestions
Merge branch 'master' of https://github.com/bjisa/cse360

Conflicts:
	src/MainDisplay.java