-save the picture
Merge branch 'master' of https://github.com/Marco-Meyer/TINF13AIBI-App-TM

Conflicts:
	Workspace/src/com/example/tinf13aibi_app_tm/MainActivity.java