Merge pull request #22 from Hartman2/master

Iteration2: I hope this is good enough...
Merge pull request #23 from Hartman2/master

Committing extra stuff for iteration 2
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
Merge pull request #6 from Coms362/master

pulling in ryan's stuff sorting