Merge pull request #27 from Redmain/dev

Dev
ADD: add Gemfile.lock
Add: pg
gem
FIX
Merge pull request #28 from Redmain/dev

Dev
Merge pull request #29 from Redmain/master

master->dev