correction rejection
Merge branch 'master' of https://github.com/AnisB/WalkingAround

Conflicts:
	src/sceneobject.cpp