Quick bug fixing, hardly complete
Merge branch 'master' of https://github.com/TheNextGuy32/GDDAPS2

Conflicts:
	GDDAPS2/Input/InputState.cs