pagination using will_paginate
changing amount of items per page
merging master