Merge pull request #1 from Coms362/master

merge iteration 2 code
finished sorting use cases
Merge pull request #24 from rdincher/master

finish iteration 2 code