get data with sorting and filtering
Merge branch 'master' into server-data
Merge pull request #8 from austinsmorris/server-data

get data with sorting and filtering