Merge branch 'master' into Tobias
lade till jar-fil för databas
Merge branch 'Tobias'
Merge branch 'master' into Tobias
Added some  comments
Merge branch 'Tobias'
Merge branch 'master' into Emily