Shows test

Hugmynd að hlut
Merge remote-tracking branch 'origin/master'

Conflicts:
	TiVi-Dagatal/bin/TiVi-Dagatal.apk
	TiVi-Dagatal/bin/classes.dex
	TiVi-Dagatal/bin/resources.ap_