initial commit
Added rails_12factor gem and updated Gemfile.lock
Merge branch 'temp1'