zwischen commit
Merge branch 'master' of https://github.com/mStellmann/VSP_Aufgabe2

Conflicts:
	src/nodeFunction.erl