some changes
Merge branch 'master' of https://github.com/distlingur/Vortex

Conflicts:
	OrbitingAffector.cpp