Testa bare en liten endring
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/main.xml
Merge remote-tracking branch 'origin/master'
Testa bare en liten endring for andre gang