pulling changes
Merge branch 'master' of github.com:dyep49/alex into development
can filter by most views
sort by recent and viewed