Android opdatering
martin kilder
Merge branch 'origin/master'

Conflicts:
	bibl.bib
Merge branch 'origin/master'

Conflicts:
	bibl.bib