bad shaders
shader almost working, triangle left to do
Shaders are all working properly
a failed merge attempt
shader file was saved this time
Another failed merge
removing commented code
refactoring code
refactored code
creating one general function to define all shapes in this lab
 more reformating
refactor assignment
Merge branch 'master' into finalizing_code