Merge pull request #3 from torijule/Forms

Forms
Merge pull request #4 from torijule/Forms

Adding customer care
main.css update-Jessica
add background img
css change
change the layout, main js file and index
add logo, edit menu.js
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
Merge pull request #5 from torijule/map

Map
Update main.css
Update index.html
css, add img, index
fix menu.js
edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/menu.js
updated to everyone's files
commit
commit
Merge branch 'map'