tákn h
Merge branch 'master' of https://github.com/sbleika/Blissid
h tákn
prufa
Merge branch 'master' of https://github.com/sbleika/Blissid

Conflicts:
	.gitignore
	.idea/workspace.xml
	BlissAppid_git/Blisstáknin/Blizztákn/Thumbs.db
	BlissAppid_git/Blisstáknin/Blizztákn/h-ö/Thumbs.db