Merge origin/master
Conflicts:
Merge origin/master
Conflicts:
Merge origin/master
Conflicts:
Merge origin/master

Conflicts:
	BDProject.mwb
	BDProject.mwb.bak
	controller/addCart.php
	controller/addRate.php
	controller/removeCart.php
	controller/sign/validsignup.php
	controller/toolkit/ToolKitDisplay.php
	javascript/toolkit.js
	model/interfaces/ETypeUser.php
	patternInterface.sql
	todo.xlsx
	view/contact.php
	view/forget.php
	view/signup.php
	view/structure/header.php
Merge origin/master

Conflicts:
	BDProject.mwb
	BDProject.mwb.bak
	controller/addCart.php
	controller/addRate.php
	controller/removeCart.php
	controller/sign/validsignup.php
	controller/toolkit/ToolKitDisplay.php
	javascript/toolkit.js
	model/interfaces/ETypeUser.php
	patternInterface.sql
	todo.xlsx
	view/contact.php
	view/forget.php
	view/signup.php
	view/structure/header.php
Merge origin/master

Conflicts:
	BDProject.mwb
	BDProject.mwb.bak
	controller/addCart.php
	controller/addRate.php
	controller/removeCart.php
	controller/sign/validsignup.php
	controller/toolkit/ToolKitDisplay.php
	javascript/toolkit.js
	model/interfaces/ETypeUser.php
	patternInterface.sql
	todo.xlsx
	view/contact.php
	view/forget.php
	view/signup.php
	view/structure/header.php
Merge origin/master

Conflicts:
	controller/sign/validsignup.php