Added forem and kaminari gems
fixed merge conflict