change is good
Merge remote-tracking branch 'origin/Test2' into Test2

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