BROKEN: Shader not working
Updated framework, fixed broken code
Merge branch 'Lesson47' into development