skrevet om database og lagt til menubar
derp
Merge branch 'master' of https://github.com/Naiv/android14-gruppe16

Conflicts:
	.gradle/1.11/taskArtifacts/cache.properties.lock
	.gradle/1.11/taskArtifacts/fileHashes.bin
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/outputFileStates.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml
	app/build/apk/app-debug-unaligned.apk
	app/build/classes/debug/com/gruppe16/bensinkalkulator/MainActivity.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/MySQLiteHelper.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/Trip.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/TripsDataSource.class
	app/build/dex/debug/classes.dex
	app/build/incremental/mergeResources/debug/merger.xml
	app/build/libs/app-debug.ap_
	app/build/res/all/debug/values-sw600dp/values.xml
	app/build/res/all/debug/values/values.xml
	app/src/main/java/com/gruppe16/bensinkalkulator/MainActivity.java
	app/src/main/java/com/gruppe16/bensinkalkulator/MySQLiteHelper.java
	app/src/main/java/com/gruppe16/bensinkalkulator/Trip.java
	app/src/main/java/com/gruppe16/bensinkalkulator/TripsDataSource.java