modified:   controller/config.php
	modified:   controller/profil/profil.php
	modified:   controller/restaurant/restaurant.php
	modified:   controller/write-a-review/write-a-review.php
	modified:   model/ajoute_revue.php
Merge branch 'master' of https://github.com/Chopintropbien/sweetTable

Conflicts:
	.idea/workspace.xml

	modified:   .idea/deployment.xml
	modified:   .idea/workspace.xml
	deleted:    controller/connexion/connexion_inscription.php
	modified:   model/connexion_database_verification.php