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 images, index.html, JS for menu items, and temporary CSS
test
Merge branch 'ray'
Merge pull request #2 from torijule/map

test
Merge branch 'master' of https://github.com/torijule/INFO343Final into Forms

Conflicts:
	css/main.css
Adding customer care

Adding file
Merge branch 'map'
Merge branch 'master' of https://github.com/torijule/INFO343Final
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