Query updated and Code updated
Merge branch 'master' of https://github.com/fredang85/lessons-matchmaker