fout in mainactivity
Merge branch 'Thierry' of https://github.com/Ipmedt4b/project3 into Thierry

Conflicts:
	IPMEDT4/gen/com/example/ipmedt4/R.java