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

Conflicts:
	Less/main.less
	index.html