g

P
database functional
functional database
i don't know what I'm committing
Merge branch 'master' of https://github.com/sbleika/Blissid

Conflicts:
	BlissAppid_git/BlissAppid/app/src/main/java/com/example/seventeen/blissappid/nothafi1.java
removed symbols.db
Bakgrunnur

Setti inn bakgrunninn og aðeins að fikta í BlissAppstöfunum
Smá fikt
Merge branch 'master' of https://github.com/sbleika/Blissid
bætti við tökkum i starfsmannaviðmot

vantar samt xml skrar þetta er eitthvað skritið hja git
Sweet nadi ad laga xml fokkup .gitignore var i rugli
button pressed
gitignore
k
honnun
bio takki fixed
Merge branch 'master' of https://github.com/sbleika/Blissid
fakk
added database generator
Merge branch 'master' of https://github.com/sbleika/Blissid