integrated kaminari
Merge pull request #20 from maryschmidt/kaminari

integrated kaminari