Merge branch 'hopeful' of /home/thorhildur/AndroidStudioProjects/MenuApp with conflicts.
virkar en naer ekki i rettar myndir
bætti við fullt af villuskilaboðum
Merge remote-tracking branch 'origin/hopeful'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/gunnarsturla/menuapp/StartActivity.java
	app/src/main/java/data/XMLHandler.java
	app/src/main/java/menu/SubMenu.java