#151 Health nutration violations regarding max-min protein,carbohydrate,calcium,fats almost finished
#151 nutration violations checked and user story 5.4 finished
#151 conflicts resolved
#151 resolving conflicts with items_controller
story 1.9
story 1.6
checking that the healthrecord is not null else notify the user to fill his health record
#151 fixing errors and resolving conflicts
Merge pull request #225 from DevYah/T5_mahmoudeldesouky_5.4

T5 mahmoudeldesouky 5.4
Merge pull request #245 from DevYah/T1_Saeed_1.6

T1 Saeed 1.6
conflicts
Merge branch 'master' into T2_helali_2.4