Canvas not a pointer anymore
Merge branch 'master' of github.com:rggjan/Grandma-s-Plant-Pots

Conflicts:
	src/player.cpp