sml
Merge branch 'master' of https://github.com/alec101/OSInteraction.git

Conflicts:
	OSinteraction.cpp
windows joystics/pads/wheels

-xinput & directinput & everything