layouts
Merge remote-tracking branch 'origin/reservationmemory'

Conflicts:
	restaurantApp/gen/com/example/restaurantapp/R.java