major changes
Merge branch 'master' of https://github.com/hcbl1212/cis355_main_proj

Conflicts:
	aboutUs.html
	add_item.html
	add_item.js
	index.php
	list.html