remove lines left by old git confict
add solutions for exercise on phylogenic tree
add code for exercises