Merge branch 'sinatra_static_server' of https://github.com/scottwater/octopress into scottwater-sinatra_static_server

Conflicts:
	Gemfile
	Gemfile.lock

1 files changed, 15 insertions, 11 deletions

diff --git a/Gemfile b/Gemfile
index b3a23aec..6838011c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,17 @@
 source "http://rubygems.org"
 
-gem 'rake'
-gem 'rack'
-gem 'jekyll'
-gem 'rdiscount'
-gem 'pygments.rb'
-gem 'RedCloth'
-gem 'haml', '>= 3.1'
-gem 'compass', '>= 0.11'
-gem 'rubypants'
-gem 'rb-fsevent'
-gem 'stringex'
+group :development do
+  gem 'rake'
+  gem 'rack'
+  gem 'jekyll'
+  gem 'rdiscount'
+  gem 'pygments.rb'
+  gem 'RedCloth'
+  gem 'haml', '>= 3.1'
+  gem 'compass', '>= 0.11'
+  gem 'rubypants'
+  gem 'rb-fsevent'
+  gem 'stringex'
+end
+
+gem 'sinatra', '1.2.6'