Merge pull request #5 from chrisjluc/master

Added heap sort, quick sort, and recursive and iterative merge sort
[geometry] gift wrapping algorithm for 2-D convex hulls + tests
Fixed merge conflicts