Prevent Back og smá Um Episode
Merge branch 'master' of https://github.com/eddabjork/hugbverkefni1

Conflicts:

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