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
Jonathan's updates

Changes to css and store location html
Merging updates

Conflicts:
	css/main.css
	index.html
	js/app.js
	js/menu.js
	store-locations/index.html