Testing some database stuff
Testar logcat
fixed conflicts
fixed conflicts
Fixade buggar startsida
fixade conflicts med emil lol yolo