unicorn added
fixed gemfile conflict
added unicorn procfile
Merge branch 'master' of https://github.com/cdinic/oasis