funkar fint ju sickan
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/freha_tddd13/lab2/MainActivity.java
	app/src/main/res/drawable-hdpi/item_selector.xml
funkar fint ju sickan