modal changes
Merge branch 'master' of https://github.com/farnoosh-moghadam/BeautySite