#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
Resolving conflict in members controller