new stuff likkle tamayus
SliderPanel update
Merge branch 'master' into Tanmay
metadata shit
Merge branch 'sahil' into Tanmay

Conflicts:
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Copy
of RocketShipTest/.markers.snap
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Copy
of RocketShipTest/.syncinfo.snap

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/testfo
rlayout/.markers.snap

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/testfo
rlayout/.syncinfo.snap

workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.s
nap

workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.core.resources/.snap

workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHis
tory.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.core/1478917655.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/2080564526.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	workspace/testforlayout/bin/FlowlayoutExperiment.class
	workspace/testforlayout/src/FlowlayoutExperiment.java