Initial commit
Merge remote-tracking branch 'justahero/master'
Merge branch 'master' into render-triangles