set up unicorn
run bundle install for new added gem
modified database.yml
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
fixes .gitignore
fixes .gitignore for github branch