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

Conflicts:
	src/nodeFunction.erl
Merge branch 'master' of https://github.com/mStellmann/VSP_Aufgabe2
Merge branch 'master' of https://github.com/mStellmann/VSP_Aufgabe2
reject ready