added food, signals, and pheromones
fixed merge