5.1_adding_diseases
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T5_jihan_5.1_adding_disease
5.1_story
Shopping Cart
1.5_Shopping_Cart_#164
adding_diseases_with_recommendations_and_restrictions
not working yet(2.1 - 2.7)
#151 Health nutration violations regarding max-min protein,carbohydrate,calcium,fats almost finished
Merge branch 'master' of https://github.com/DevYah/smartsoft-14
Adding story 2.12 for filter search for items
functional without doc
user can show/ edit profile
 a  user can show and edit profile
user can edit profile
completeting the story
resolving conflicts
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T2_tonyfoti_2.12
#158 adding filter search after organizing the code to be in the controller
Redirection to users healthrecords to order for themselves/choose persons to order for/create new healthrecord for new person
after change file spaces