Add circle collision detection
Package shapes and delete temporary files
Move Canvas into its own class.
Add fill