Gemfile.orig

source 'https://rubygems.org'

ruby '1.9.3'
gem 'rails', '3.2.8'

gem 'mongoid', '~> 3.0.0'
gem 'thin'
gem "high_voltage"
gem 'haml-rails'
gem 'devise'
gem 'omniauth'
gem 'omniauth-facebook'
gem 'koala'
gem 'twitter'
gem 'twitter-text'
gem 'vacuum'
gem 'nokogiri'
gem 'gon'
gem 'underscore-rails'
<<<<<<< Updated upstream
gem 'asset_sync'
=======
gem 'tire'
gem 'rabl'
gem 'kaminari'
>>>>>>> Stashed changes

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'



# Gems used only for assets and not required
# in production environments by default.
group :assets do
  gem 'masonry-rails'
  gem 'sass-rails',   '~> 3.2.3'
  gem 'compass-rails'
  gem 'bootstrap-sass', git: 'git://github.com/thomas-mcdonald/bootstrap-sass.git'
  gem 'coffee-rails', '~> 3.2.1'
  gem 'font-awesome-sass-rails'

  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
  # gem 'therubyracer', :platforms => :ruby

  gem 'uglifier', '>= 1.0.3'
end

gem 'jquery-rails'

group :development, :test do
  gem 'pry-rails'
  gem 'awesome_print'
  gem 'sextant'
  gem 'pry-remote'
end

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'

# To use Jbuilder templates for JSON
# gem 'jbuilder'

# Use unicorn as the app server
# gem 'unicorn'

# Deploy with Capistrano
# gem 'capistrano'

# To use debugger
# gem 'debugger'