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