committ af því bara
Merge remote-tracking branch 'origin/master'

Conflicts:

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