still working on sorting tests. i'm pretty sure i don't know what's supposed to be happening
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project