eventgen test (todo: y value, calling child function)
Merge branch 'master' of github.com:skogler/storyofanerd

Conflicts:
	src/EngineCore.cpp
	src/EngineCore.hpp