update
Merge branch 'master' of https://github.com/tam724/physenging

Conflicts:
	README_so_geht_git.txt