added pagination
Merge branch 'develop' of github.com:vtmer/freshman into develop
fixed parse error about array
Merge pull request #2 from MaureenChan/develop

fixed parse error about array