nog niet werkende lijst
listview werkend
temp
test
properties invoerbaar
Merge remote-tracking branch 'origin/main' into coffee_list

Conflicts:
	moyee/bin/R.txt
	moyee/bin/classes.dex
	moyee/bin/jarlist.cache
	moyee/bin/moyee.apk
	moyee/bin/resources.ap_
	moyee/gen/hsl/groep5/moyee/R.java
	moyee/project.properties
	moyee/src/hsl/groep5/moyee/MainActivity.java
final zonder plaatjes
binaries
..
final touches
commentaar toegevoegd
..
Merge branch 'coffee_list' into main

Conflicts:
	moyee/bin/R.txt
	moyee/bin/classes.dex
	moyee/bin/dexedLibs/android-support-v4-b51b6c2c511c1a2f5e4265ab15445554.jar
	moyee/bin/dexedLibs/annotations-db598a27600838e040eb9338d99c953d.jar
	moyee/bin/dexedLibs/google-play-services-702dfa75b08dc96b06f72f3acf393880.jar
	moyee/bin/dexedLibs/google-play-services_lib-80fcb64fe3123d92750c9fc32cbc43a8.jar
	moyee/bin/dexedLibs/library-3cc43a43d077dc6aea7ee2b14fef7678.jar
	moyee/bin/dexedLibs/maps-4f1338e044b9d1b4b815759f05cbd71e.jar
	moyee/bin/moyee.apk
	moyee/bin/resources.ap_
	moyee/res/values-nl-rNL/strings.xml
	moyee/res/values/strings.xml
Merge branch 'main' of https://github.com/projectgroep5/Moyee_app into main

Conflicts:
	moyee/src/hsl/groep5/moyee/MainActivity.java