Revert 6f02955..e56bb24

This rolls back to commit 6f029555c88422e372b8d6384462a184ebd1dafe.
Merge branch 'master' of https://github.com/thorhildurmagnusdottir/MenuApp

Conflicts:
	app/src/main/res/layout/ordered.xml