git pull error

hugh@hugh-ThinkCentre-M58p:~/enigma-dev$ git pull
Updating db8e1df..a915b15
error: Your local changes to the following files would be overwritten by merge:
	.travis.yml
	CompilerSource/compiler/compile.cpp
	CompilerSource/gcc_interface/gcc_backend.cpp
	CompilerSource/gcc_interface/gcc_backend.h
	CompilerSource/general/bettersystem.h
	CompilerSource/general/macro_integration.h
	CompilerSource/makedir.h
	CompilerSource/settings-parse/crawler.cpp
	CompilerSource/settings-parse/parse_ide_settings.cpp
	CompilerSource/settings.cpp
	CompilerSource/settings.h
	Compilers/Linux/Android.ey
	Compilers/Linux/AndroidSym.ey
	Compilers/Linux/AppleCross64.ey
	Compilers/Linux/MinGW32.ey
	Compilers/Linux/MinGW64.ey
	Compilers/Linux/TestHarness.ey
	Compilers/Linux/clang.ey
	Compilers/Linux/clang32.ey
	Compilers/Linux/gcc.ey
	Compilers/Linux/gcc32.ey
	Compilers/MacOSX/Android.ey
	Compilers/MacOSX/clang.ey
	Compilers/MacOSX/gcc-mingw32-intel.ey
	Compilers/MacOSX/gcc.ey
	Compilers/MacOSX/iPhone.ey
	Compilers/Windows/gcc.ey
	ENIGMAsystem/SHELL/Audio_Systems/DirectSound/DSsystem.cpp
	ENIGMAsystem/SHELL/Audio_Systems/DirectSound/Info/About.ey
	ENIGMAsystem/SHELL/Audio_Systems/OpenAL/Info/About.ey
	ENIGMAsystem/SHELL/Audio_Systems/OpenAL/Makefile
	ENIGMAsystem/SHELL/Audio_Systems/SFML/Info/About.ey
	ENIGMAsystem/SHELL/Audio_Systems/iOSOpenAL/Info/About.ey
	ENIGMAsystem/SHELL/Bridges/General/DX11Context.h
	ENIGMAsystem/SHELL/Bridges/General/DX9Context.h
	ENIGMAsystem/SHELL/Bridges/Win32-Direct3D11/Makefile
	ENIGMAsystem/SHELL/Bridges/Win32-Direct3D11/graphics_bridge.cpp
	ENIGMAsystem/SHELL/Bridges/Win32-Direct3D9/Makefile
	ENIGMAsystem/SHELL/Bridges/Win32-Direct3D9/graphics_bridge.cpp
	ENIGMAsystem/SHELL/Bridges/Win32-OpenGL1/graphics_bridge.cpp
	ENIGMAsystem/SHELL/Bridges/Win32-OpenGL3/graphics_bridge.cpp
	ENIGMAsystem/SHELL/Graphics_Systems/Direct3D11/DX11vertex.cpp
	ENIGMAsystem/SHELL/Graphics_Systems/Direct3D11/Info/About.ey
	ENIGMAsystem/SHELL/Graphics_Systems/Direct3D9/DX9vertex.cpp
	ENIGMAsystem/SHELL/Graphics_Systems/Direct3D9/Info/About.ey
	ENIGMAsystem/SHELL/Graphics_Systems/General/GSvertex.cpp
	ENIGMAsystem/SHELL/Graphics_Systems/General/GSvertex.h
	ENIGMAsystem/SHELL/Graphics_Systems/General/GSvertex_impl.h
	ENIGMAsystem/SHELL/Graphics_Systems/None/fillin.cpp
	ENIGMAsystem/SHELL/Graphics_Systems/OpenGL1/GLvertex.cpp
	ENIGMAsystem/SHELL/Graphics_Systems/OpenGL1/Info/About.ey
	ENIGMAsystem/SHELL/Graphics_Systems/OpenGL1/Makefile
	ENIGMAsystem/SHELL/Graphics_Systems/OpenGL3/GL3vertex.cpp
	ENIGMAsystem/SHELL/Graphics_Systems/OpenGL3/Info/About.ey
	ENIGMAsystem/SHELL/Graphics_Systems/OpenGL3/Makefile
	ENIGMAsystem/SHELL/Graphics_Systems/OpenGLES/Info/About.ey
	ENIGMAsystem/SHELL/Graphics_Systems/Shaders/Default/About.ey
	ENIGMAsystem/SHELL/Graphics_Systems/Shaders/Normal/About.ey
	ENIGMAsystem/SHELL/Graphics_Systems/Shaders/Reflective/About.ey
	ENIGMAsystem/SHELL/Graphics_Systems/Shaders/Self-Illuminated/About.ey
	ENIGMAsystem/SHELL/Graphics_Systems/Shaders/Transparent Cutout/About.ey
	ENIGMAsystem/SHELL/Graphics_Systems/Shaders/Transparent/About.ey
	ENIGMAsystem/SHELL/Platforms/Android/Info/About.ey
	ENIGMAsystem/SHELL/Platforms/General/PFmain.cpp
	ENIGMAsystem/SHELL/Platforms/General/PFmain.h
	ENIGMAsystem/SHELL/Platforms/General/PFthreads.h
	ENIGMAsystem/SHELL/Platforms/General/PFwindow.h
	ENIGMAsystem/SHELL/Platforms/General/POSIX/POSIXfilemanip.cpp
	ENIGMAsystem/SHELL/Platforms/General/POSIX/POSIXthreads.cpp
	ENIGMAsystem/SHELL/Platforms/General/POSIX/Utility.cpp
	ENIGMAsystem/SHELL/Platforms/General/POSIX/main.cpp
	ENIGMAsystem/SHELL/Platforms/Win32/Makefile
	ENIGMAsystem/SHELL/Platforms/Win32/WINDOWSmain.cpp
	ENIGMAsystem/SHELL/Platforms/Win32/WINDOWSthreads.cpp
	ENIGMAsystem/SHELL/Platforms/iPhone/Info/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/Alarms/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/Asynchronous/ASYNCdialog.cpp
	ENIGMAsystem/SHELL/Universal_System/Extensions/Asynchronous/ASYNCdialog.h
	ENIGMAsystem/SHELL/Universal_System/Extensions/Asynchronous/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/Asynchronous/Makefile
	ENIGMAsystem/SHELL/Universal_System/Extensions/BasicGUI/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/Box2DPhysics/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/BulletDynamics/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/DataStructures/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/DateTime/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/DirectShow/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/GM5Compat/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/MatrixMath/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/MediaControlInterface/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/MotionPlanning/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/ParticleSystems/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/Paths/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/StudioPhysics/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/Timelines/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/WindowsTouch/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/XInput/About.ey
	ENIGMAsystem/SHELL/Universal_System/Extensions/XInput/XIgamepad.cpp
	ENIGMAsystem/SHELL/Universal_System/Extensions/XInput/XIgamepad.h
	ENIGMAsystem/SHELL/Universal_System/Extensions/XInput/include.h
	ENIGMAsystem/SHELL/Universal_System/Extensions/ttf/About.ey
	ENIGMAsystem/SHELL/Widget_Systems/GTK+/Info/About.ey
	ENIGMAsystem/SHELL/Widget_Systems/None/Info/About.ey
	ENIGMAsystem/SHELL/Widget_Systems/TinyFileDialogs/Info/About.ey
	ENIGMAsystem/SHELL/Widget_Systems/TinyFileDialogs/dialogs.cpp
	ENIGMAsystem/SHELL/Widget_Systems/Win32/Info/About.ey
	appveyor.yml
	shared/eyaml/eyaml.h
Please, commit your changes or stash them before you can merge.
Aborting