Merge pull request #15 from gafrong/master

kaminari... pagenation
fixed the test