Gemfile pg for Heroku
Merge branch 'master' of /Users/yihenlim/demo/omrails

Conflicts:
	README.md
Updated Gemfile for heroku and README doc