changed
adding shopping cart

shopping cart: index.php, cart.update, view cart.php
changed my_sql to my_sqli
some changes in insert.php
comment and some more function

edit page
adding confirm box for delete product.
create database
get rid of unneccesary code.
Edit page updated
Ajax, cart update
some changes

product display
Big update.

managed php file.
Create Category table.
Active and reactive button

change the form to button, create another javascript file for admin
product page.
Created billing system.

-Putting Stock in index page.
-Finish create database in create-db.php.
-Finish checkout.php: decrease stock, update order information.
-Putting stock information in product_display.php.
updated
Doing navigation, ajax
changed a bit
abc
Merge branch 'master' of https://github.com/baolong93/CMS

Conflicts:
	index.php
	php/insert.php
	php/upload.php