pagination
Fix conflict in gitignore
Merge pull request #4 from callicles/pagination

Pagination