ok
Merge branch 'master' of https://github.com/TimmyParkwayd/FoodTruck

Conflicts:
	src/main/java/com/formation/foodtruck/controller/ClientController.java
Classes client