hej he

hehhej
Merge remote-tracking branch 'origin/master' into Anna
Merge remote-tracking branch 'origin/master' into Anna
lagt till DB-connection
Merge remote-tracking branch 'origin/master' into Anna
Merge remote-tracking branch 'origin/master' into Anna
Merge remote-tracking branch 'origin/master' into Anna
test i databas
Merge branch 'Anna' into Tobias

Conflicts:
	DataBase.java