Changed name to paper
Merge branch 'master' of https://github.com/mdbenjam/trianglePainterPaper

Conflicts: