beginning to update collisions

Doesn't quite work, but they don't get stuck when they try to move out
of stuff now
Merge branch 'master' of https://github.com/barrymillham/Rugger_V4

Conflicts:
	RnD2/Colored Cube App.cpp