commit
commit
Merge branch 'Jessica'

Conflicts:
	css/main.css
	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 branch 'master' of https://github.com/torijule/INFO343Final

Conflicts:
	README.md
	css/main.css
	index.html
	js/app.js
	js/menu.js