settings modal integration (part3)
Merge branch 'master' of https://github.com/saharrehani/Pinster