merge
Merge branch 'master' of https://github.com/lizwilkins/irie into paginate
Merge branch 'master' into paginate
Merge pull request #6 from lizwilkins/paginate

Merge paginate into master