Rød delete knapp
Merge branch 'master' of https://github.com/OralBean/s188094_s188066_mappe2

Conflicts:
	bin/MainActivity.apk
	bin/classes.dex

bin/classes/com/example/s188094_s188066_mappe2/EnterContactActivity.clas
s
	bin/classes/com/example/s188094_s188066_mappe2/MainActivity.class
	bin/classes/com/example/s188094_s188066_mappe2/R$drawable.class
	bin/classes/com/example/s188094_s188066_mappe2/R$id.class
	bin/classes/com/example/s188094_s188066_mappe2/R$layout.class
	bin/classes/com/example/s188094_s188066_mappe2/R$menu.class
	bin/classes/com/example/s188094_s188066_mappe2/R$string.class
	bin/classes/com/example/s188094_s188066_mappe2/R$style.class
	bin/resources.ap_
	gen/com/example/s188094_s188066_mappe2/R.java