merge & removing debug printf. (in Settings.cpp, by myself, useless)

diff --cc Source/GameTick.cpp
Simple merge

diff --cc Source/OpenGL_Windows.cpp
Simple merge

diff --cc Source/Settings.cpp
Simple merge

diff --cc Source/WinInput.cpp
index 8129225b4d3bf6969faab37c7ffd5c407e55c5dd,d42ae78ef310c4f73181e1772ed3f66ef14b9572..c5a59c349e653415d097c32f10bbb512c52aa602
--- 1/Source/WinInput.cpp
--- 2/Source/WinInput.cpp
+++ b/Source/WinInput.cpp
@@@ -21,10 -21,9 +21,10 @@@ Foundation, Inc., 59 Temple Place - Sui
  
  /**> HEADER FILES <**/
  #include "WinInput.h"
 +#include "SDL.h"
  
  #ifdef WIN32
- #include "String.h"
+ #include <string.h>
  #else
  #include <stdio.h>
  #include <stdlib.h>