initial commit
Render a triangle
Merge remote-tracking branch 'origin/master'