Updated .gitignore.
GUI via WinAPI
Fixed conflict