test commit ala daggal
Merge branch 'master' of https://github.com/daggala/RestaurantApp

Conflicts:

	RestaurantApp/app/src/main/java/com/gunnarsturla/restaurantappgi/Menu.java