Merge branch 'master' into john-graph

# Conflicts: # Gemfile
2016-05-12 16:02:38 +02:00
parent fa0d893c21 c69ab69c46
commit 6bb5b53bad
36 changed files with 322 additions and 316 deletions
--- a/1
+++ b/1
@ -37,6 +37,7 @@ gem 'tubesock'
 gem 'faye-websocket'
 gem 'nokogiri'
 gem 'd3-rails'
+gem 'rest-client’

 group :development do
  gem 'better_errors', platform: :ruby