Sliding collision kind of implemented

Some really odd behavior with buildings, I'm not really sure what's
going on
Merge branch 'master' of https://github.com/barrymillham/Rugger_V4

Conflicts:
	RnD2/Colored Cube App.cpp