Merge branch 'renemarcelo-spanish-version'
modified:   Gemfile and lock file to use unicorn, added Procfile