fg
Merge branch 'master' of https://github.com/Naiv/android14-gruppe16

Conflicts:
	app/src/main/java/com/gruppe16/bensinkalkulator/MainActivity.java