resolved conflicts and made sure that everything works

CMakeLists.txt

Notes to self.txt

assets/materials/brick.yml

assets/models/cube.yml

assets/shaders/base.glsl

assets/shaders/default.glsl

assets/textures/example.jpg

assets/textures/example_nrm.jpg

assets/textures/nrm_test.jpg

assets/textures/scifi.jpg

assets/textures/scifi_nrm.jpg

assets/textures/scifi_spec.jpg

include/overkill/Config.hpp

include/overkill/Entity.hpp

include/overkill/EntityModel.hpp

include/overkill/Renderer.hpp

include/overkill/ShaderIntrospector.hpp

include/overkill/ShaderProgram.hpp

include/overkill/ShaderSystem.hpp

include/overkill/UniformBuffer.hpp