Added a comment.
Removed comment
Merge remote-tracking branch 'upstream/master'
Added some base code for testing controller
Pull input out of game.cs and adds controller support.
Fixed merge conflicts.
Merge branch 'master' of https://github.com/jpfeltracco/DreamStateMachine into jpfeltracco-master

Conflicts:
	DreamStateMachine/DreamStateMachine.csproj
	DreamStateMachine/game.cs
	DreamStateMachine/obj/x86/Debug/DreamStateMachine.csproj.FileListAbsolute.txt
Added ignores
Merge pull request #14 from jpfeltracco/master

Updated Input Class / Controller Support
Merge branch 'master' of https://github.com/connorclockwise/DreamStateMachine

Conflicts:
	DreamStateMachine/DreamStateMachine.csproj
	DreamStateMachine/obj/x86/Debug/DreamStateMachine.csproj.FileListAbsolute.txt
Merge branch 'master' of https://github.com/connorclockwise/DreamStateMachine into develop

Conflicts:
	DreamStateMachine/DreamStateMachine.csproj
	DreamStateMachine/game.cs
	DreamStateMachine/obj/x86/Debug/DreamStateMachine.csproj.FileListAbsolute.txt