added new AStar file
recovering from conflict
trying to solve repository conflicts