Resolved merge conflicts in Gemfile.lock, added Jbuilder.
Added ruby 2.0 declaration in Gemfile.
Added development and test groups to Gemfile to stop Heroku error.
Added asset gems, precompiled assets.
Added Procfile.
Made Unicorn the production server.
Removed deprecated auto explain features.
Added rails_12factor gem.
Merge pull request #60 from maxluzuriaga/master

Heroku Rails 4 Fixes (Already pushed to heroku)