PHP project
PHP

Conflicts:
	cart/cart_view.php
	cart/controller/index.php
	cart/model/validate.php
	cart/style.css
	cart/view/register.php
	js/main.js