Merge pull request #1 from cathieyun/master

Test Edit
Third Commit
Added pg adapter gem