Osiris.1 removed
Merge branch 'GLFW' of https://github.com/lukemonaghan/Osiris into GLFW