Creation of Timeline classes
Changing timeline name to SketchBoard !
Merge conflict resolution
First draft to create tracks in the timeline
Merge remote-tracking branch 'origin/timeline' into timeline
Merge branch 'timeline'

Conflicts:
	controller/Controller.py
	main.py