Matseðillinn virkar, og pöntun virkar
Merge branch 'master' of https://github.com/thorhildurmagnusdottir/MenuApp

Conflicts:
	app/src/main/res/menu/main.xml
	app/src/main/res/values/strings.xml