Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitla...

Conflicts:
	Gemfile
	Gemfile.lock

diff --cc Gemfile
index b6c35ac,1033bfd..f103d21
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -18,8 -18,8 +18,9 @@@ gem "six
  gem "therubyracer"
  gem "faker"
  gem "seed-fu"
 -gem "pygments.rb", "~> 0.2.11"
 +gem "linguist", "~> 1.0.0", :git => "https://github.com/github/linguist.git"
 +gem "pygments.rb", "0.2.11"
+ gem "redcarpet", "~> 2.1.1"
  gem "thin"
  gem "unicorn"
  gem "git"

diff --cc Gemfile.lock
Simple merge