Merge branch 'master', remote-tracking branch 'origin' into socialcoffee

* origin:
  Convert unicorn value into integer

* master:
  Convert unicorn value into integer
checkpoint
Working on it but not finished
Less unicorn workers for production
Merge branch 'socialcoffee' of https://github.com/bdryanovski/sinatra_app into socialcoffee

* 'socialcoffee' of https://github.com/bdryanovski/sinatra_app:
  Working on it but not finished
  checkpoint
  Merge branch 'master', remote-tracking branch 'origin' into socialcoffee