Edit/general
Merge branch 'master' of github.com:lessonhome/lessonhome