Sort by attributes user story.
Merge branch 'master' of github.com:ECSE428Group/media-stream