#155  #257 adding tests to story 4.1 and 4.2 and putting the code in the models instead of the controller
#155 #257 resolving conflicts in application.rb because of autmatically generator for tests
#155 #257 resolvingsome cnflicts in member_controller and order model
Merge pull request #305 from DevYah/T4_Ahmed_4.1

T4  Ahmed 4.1 4.2
#155 #257  Resolving conflict in members controller
Merge pull request #322 from DevYah/T4_Ahmed_4.1

#155 #257  Resolving conflict in members controller
#155 #257 removing <<<<<head from model Order
Merge pull request #323 from DevYah/T4_Ahmed_4.1

#155 #257 removing <<<<<head from model Order
#280 #151 fixing tests
Merge pull request #324 from DevYah/T5_mahmoudeldesouky_5.12

#280 #151 fixing tests
resolving conflicts