Pagination
Merge pull request #48 from LaunchAcademy/pages

Pagination
fixed merge conflicts