merge with origin
Merge branch 'master' of
https://github.com/felipecomp19/StoreManagement.git

Conflicts:
	StoreManagement/src/main/java/com/textTI/storeManagement/controller/ClientController.java