Unwichtiger Commit
Merge branch 'master' of github.com:Schrottfresse/vps_mapreduce

Conflicts:
	Configuration.java
Configuration.java wieder drin