Nýtt hello!

new
Merge remote-tracking branch 'origin/master'

Conflicts:
	TiVi-Dagatal/bin/TiVi-Dagatal.apk
	TiVi-Dagatal/bin/jarlist.cache
	TiVi-Dagatal/bin/resources.ap_
	TiVi-Dagatal/res/values/strings.xml
	appcompat_v7/bin/android-support-v7-appcompat.jar