footer edited
Merge branch 'master' of https://github.com/farnoosh-moghadam/BeautySite

Conflicts:
	index.html
Merge branch 'master' of https://github.com/farnoosh-moghadam/BeautySite