comment change for potential future issues
Merge branch 'collision_bug_fix' into development

Conflicts:
	physical/universe.cpp