merging with mike and implemented the orderby
Merge branch 'master' of https://github.com/mfleming7024/wingaminglounge