config file out of box
coufigure for unicorn_rails
Merge remote branch 'origin/master'