Add needed gems
Fix possible merge conflig?
Add pg gem to development