tekst test william weggehaald
test2

tekst wiliam weggehaald
test
Merge branch 'master' of https://github.com/Ipmedt4b/project3

Conflicts:
	IPMEDT4/src/com/example/ipmedt4/MainActivity.java