Basic Xinput added

overrides keyboard currently, first  connected Xpad will be the only one
that works (indeded) dinput  will be added later
Merge remote-tracking branch 'origin/Rob'
Merge remote-tracking branch 'origin/Rob'

Conflicts:
	OurSuperPlatformer/OurSuperPlatformer/main.cpp
repaired  conflict
Level changes

It's been moved to the bottom now, I'm going to rework it to use all
that new space at the top and post that tomorrow with the win screen and
game over screen