commit before pull
fixed merge conflicts
distance vector protocol added