DORRENE FIXING THINGS ON KRISTENS COMPUTER
Something something sorting something something
Merge pull request #15 from kristenmills/master

merged commits