working on mergeconflicts

Conflicts:
	.idea/workspace.xml
	gagnagrunnsvinnsla/DBLoader.py
gera 4 takka i bio toflu
Merge branch 'master' of https://github.com/sbleika/Blissid
bf

f
db
b
laga dbhelperbio
debugging helper
Merge branch 'master' of https://github.com/sbleika/Blissid
final touches on helper debug
bf
gg
javadoc update
vantar skjolun a DBHelper
javadoc og sma skjolun
smá eyðingar og nafnabreytingar
nytt activity

full blisstafla er komin í startholurnar. mun reyna klára þetta næstu
daga
maketable
buttons i bua til toflu
full blisstafla

Takkar á leiðinni