read screen reformatting
Merge branch 'master' of https://github.com/educoder/neighbourhood-safari
resolve merge conflict