test
test
Merge branch 'master' of https://github.com/3D-Printed-Granular-Jamming-Hand/3d-printed-granular-jamming-hand

Conflicts:
	ProgressReports/Report 1 Segments/Granular Jamming Hand Phase 1 Report ROUGH DRAFT.docx