Dickwad
Dickwad
Merge branch 'master' of https://github.com/thorhildurmagnusdottir/MenuApp

Conflicts:
	app/src/main/java/com/gunnarsturla/menuapp/OrderFragment.java
	app/src/main/java/com/gunnarsturla/menuapp/OrderListAdapter.java
	images/cocacola.png
	images/humarsupa.jpg
	images/hvitvin.png
	images/limevatn.png
	images/melone.png
	images/randalina.png
	images/raudvin.png
	images/snittur.png
	images/ulfur.jpg