resolved merge conflict

.gitignore

CMakeLists.txt

Notes to self.txt

assets/materials/brick.yml

assets/materials/default.yml

assets/materials/subsurfaceScatter.yml

assets/models/Bunny.yml

assets/models/Halvor.yml

assets/models/Icosphere.yml

assets/models/Suzanne.yml

assets/models/cube.yml

assets/shaders/base.glsl

assets/shaders/default.glsl

assets/shaders/subsurfaceScatter.glsl

config.yml

include/overkill/Config.hpp

include/overkill/Entity.hpp

include/overkill/EntityCamera.hpp

include/overkill/EntityModel.hpp

include/overkill/Init.hpp