5.1_adding_diseases
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T5_jihan_5.1_adding_disease
5.1_story
adding_diseases_with_recommendations_and_restrictions
#151 Health nutration violations regarding max-min protein,carbohydrate,calcium,fats almost finished
completeting the story
resolving conflicts
covering the rest of the scenarios
enhancing UI
conflicts
#151 nutration violations checked and user story 5.4 finished
Story 2.14 done
Merge branch 'master' into show_restricted_items

Conflicts:
	HealthyGrocery/app/controllers/members_controller.rb
	HealthyGrocery/app/views/layouts/application.html.erb
	HealthyGrocery/app/views/members/hub.html.erb
	HealthyGrocery/config/routes.rb
conflict resolving
ya rab
ya rab tany
besmallah
#151 conflicts resolved
#151 resolving conflicts with items_controller
both links working