commiting for pull
merge conflicts
changed the reservation controller from user_id to member_id
 changed routes to shallow routes