Merging...
about to merge
Merge branch 'master' of https://github.com/sbonner1/Senior-Design-I
Did some work on thinning out line families so we can remove some uneccassary lines
Robot arm moves, With assistance of Shane.
merging with Josh's branch
Merge branch 'master' of https://github.com/jcoady9/Senior-Design-I
Tiny line test fix
Cleaning up the code in the test classes
Created headder and cpp file for the heapsort algorithm that will help sort
the line_family vector so that it can be processed to remove duplicates.
Also implemented a quicksort algorithm to use until we get heapsort working.
merge with josh
Modified the robot arm program to compensate for the third installed motor.
merge with changes from Sam
Merge branch 'master' of https://github.com/shamor/Senior-Design-I