work
Merge branch 'triangle' into develop
Fixed gl rendering of screen
Merge branch 'develop' of https://github.com/johbe559/schumacher into develop