refactored canvas and timeline classes to make them more modular
Merge branch 'master' of github.com:scsper/sandj