Sorting implemented and tests pass
fixing some conflicts
Sorting works, need to improve tests
Merge branch 'master' of github.com:CMPUT301F14T09/Team09Project