precompile
added rails_12factor gem
resolve conflicts