Clairfy conversation screen text
Formatting changes
Merge branch 'master' of https://github.com/cmann50/lunch.git

Conflicts:
	lunch/src/main/java/lunch/web/RestaurantController.java