Write coding class lesson plan
Fix merge conflict