Leitarniðurstöður fer aftur í leit  við back
Merge remote-tracking branch 'origin/master'

Conflicts:

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