Basic Xinput added

overrides keyboard currently, first  connected Xpad will be the only one
that works (indeded) dinput  will be added later
Collision Done

Collision is done with all the game breaking stuff fixed up.
-Fixed bug that would shift the player to the right or left of certain
platforms when doing an ascending jump
-Fixed bug that would teleport player to top of platform when colliding
on the side of the platform while ascending or descending
Small Comment Update

Added a few new comments to some of the new collision code.
Merge remote-tracking branch 'origin/Rob'

Conflicts:
	OurSuperPlatformer/OurSuperPlatformer/main.cpp
repaired  conflict