works but gives errors
Merge branch 'JaredTestGUI'

Conflicts:
	.classpath
	bin/test2.class
	src/test2.java
got canvas to work
got side panel and tabs working
Added TimeSlider Class
Delete Alex_test.java
Delete hs_err_pid6032.log
Delete hs_err_pid5966.log
Delete Jared_test
Delete Jared test~
Added Dl Button to download pane
Added slider and dl button... Crudely
Merge branch 'AlexDownload'
Merge branch 'master' of https://github.com/amer236/SE206Assignment3
refactored everything
got filechooser done