Shit be working
Changed to .php
Merge branch 'master' of https://github.com/tcosentino/ZagBay

Conflicts:
	addInventory.html
	addProduct.html
	app/addInventory.html
	app/addInventory.php
	app/addProduct.html
	app/addProduct.php
	app/cart.html
	app/cart.php
	app/category.html
	app/category.php
	app/checkout.html
	app/checkout.php
	app/index.html
	app/index.php
	app/orders.html
	app/orders.php
	app/product.html
	app/product.php
	app/search.html
	app/search.php
	app/searchResult.html
	app/searchResult.php
	app/sellerHome.html
	app/sellerHome.php
	cart.html
	category.html
	checkout.html
	index.html
	orders.html
	product.html
	search.html
	searchResult.html
	sellerHome.html