Repeated measures 2 way ANOVA

Check the MixedModels package. Random effects are generally considered the modern way of dealing with repeated measures.