Engar niðurstöður í leit
Merge remote-tracking branch 'origin/master'

Conflicts:

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