fixed merge error
Merge branch 'master' of https://github.com/scwdxy/north-coast-community-homes-mashup