updated to everyone's files
added everyones part to a single master
Merge branch 'map' of https://github.com/torijule/INFO343Final into map

Conflicts:
	customer-care/index.html
	images/banner.jpg
	images/equipment.jpg
	images/icons/tanpro_favicon.png
	images/icons/you-tube-icon.jpg
	images/skin-care.jpg
	images/sunless-tanning.jpg
	images/tan_pro_update.jpg
	images/tanwoman.jpg
	images/tanwoman1.jpg
	index.html
	js/menu.js
added everyone's change and updated map scale
Merge pull request #8 from torijule/Forms

Jonathan's updates
fix home link
update the links on the top (Jessica)
comment out ugly part
Update index.html
Update index.html
Update index.html
Update index.html
added links to the form
Update main.css
Update index.html
Update index.html
Update index.html
Fixing some css in customer care and merging problems from earlier

Conflicts:
	customer-care/index.html
Taking out git garbage
make the links link to tori's website