Merging in engine files

.gitignore

@@ -1,3 +1,13 @@
+<<<<<<< HEAD
+=======
+# ---> KDevelop4
+#*.kdev4
+#.kdev4/
+
+# --->  build artifacts
+build/*
+
+>>>>>>> master
 # ---> C++
 # Prerequisites
 *.d
@@ -44,7 +54,10 @@
 
 # Linker output
 *.ilk
+<<<<<<< HEAD
 *.map
+=======
+>>>>>>> master
 *.exp
 
 # Precompiled Headers
@@ -86,6 +99,7 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
+<<<<<<< HEAD
 # ---> CMake
 CMakeLists.txt.user
 CMakeCache.txt
@@ -98,4 +112,8 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
+=======
+# CMake artifacts
+CMakeCache.txt
+>>>>>>> master