yanked diy branch to master

Gemfile

@@ -1,23 +1,17 @@
 source 'https://rubygems.org'
 
-gem 'volt', '0.9.5.pre4'
+gem "opal" , :github => "opal/opal"
+gem 'opal-browser'
 
-# volt uses mongo as the default data store.
-gem 'volt-mongo', '~> 0.1.0'
+#gem "salama" , "0.2" , :path => "../salama"
 
-gem "parslet" , git: "https://github.com/salama/parslet.git"
-#gem "salama" , git: "https://github.com/salama/salama.git"
-gem "salama" , path: "../salama"
-gem "salama-reader" , git: "https://github.com/salama/salama-reader.git"
-gem "salama-arm" , git: "https://github.com/salama/salama-arm.git"
-gem "salama-object-file" , git: "https://github.com/salama/salama-object-file.git"
-gem "susy" , "2.2.5"
-
-# Asset compilation gems, they will be required when needed.
-gem 'csso-rails', '~> 0.3.4', require: false
-gem 'uglifier', '>= 2.4.0', require: false
-
-#gem "foundation" , :github => "zurb/foundation"
+gem "parslet" , github: "salama/parslet"
+gem "salama" , github: "salama/salama"
+gem "salama-reader" , github: "salama/salama-reader"
+gem "salama-arm" , github: "salama/salama-arm"
+gem "salama-object-file" , github: "salama/salama-object-file"
+gem "sass"
+gem "susy"
 
 group :test do
   # Testing dependencies
@@ -29,13 +23,3 @@ group :test do
   gem 'chromedriver2-helper', '~> 0.0.8'
   gem 'poltergeist', '~> 1.5.0'
 end
-
-# Server for MRI
-platform :mri, :mingw do
-  # The implementation of ReadWriteLock in Volt uses concurrent ruby and ext helps performance.
-  gem 'concurrent-ruby-ext', '~> 0.8.0'
-
-  # Thin is the default volt server, Puma is also supported
-  gem 'thin', '~> 1.6.0'
-  gem 'bson_ext', '~> 1.9.0'
-end