Canvas and player
Merge branch 'master' of https://github.com/TeamRoseChampagne/Team-Rose-Champagne