updated application.css to remove add_tree
updated application.rb
removed conflict
removed precompile assets line
reordered gemfile
created production section in gemfile