Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge branch 'master' of https://github.com/bdryanovski/sinatra_app
Merge branch 'master' of https://github.com/bdryanovski/sinatra_app
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Convert unicorn value into integer
Merge branch 'master', remote-tracking branch 'origin' into socialcoffee

* origin:
  Convert unicorn value into integer

* master:
  Convert unicorn value into integer