Some changes
Merge branch 'master' of https://github.com/cray935/c4j-repo

Conflicts:
	Aufgabe2/MapTemplate/map.h