Icons komin inn og fleira
Merge branch 'master' of https://github.com/thorhildurmagnusdottir/MenuApp

Conflicts:
	app/src/main/java/com/gunnarsturla/restaurantappgi/MainActivity.java
	app/src/main/java/com/gunnarsturla/restaurantappgi/OrderActivity.java
	app/src/main/res/menu/main.xml