Conflicted versions resolved.
Lessonplans completed. Download page completed