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 pull request #14 from jpfeltracco/master

Updated Input Class / Controller Support