Til að sækja Jóhönnu-stöff
Merge remote-tracking branch 'origin/master'

Conflicts:
	TiVi-Dagatal-Fragment/gen/com/example/tivi_dagatal_fragment/R.java

	TiVi-Dagatal-Fragment/src/com/example/tivi_dagatal_fragment/FragmentList.java