Merge branch 'master' of https://github.com/bikebike/BikeBike

Conflicts:
	Gemfile
	Gemfile.lock

test/models/event_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class EventTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/models/event_type_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class EventTypeTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/models/workshop_facilitator_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class WorkshopFacilitatorTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/models/workshop_requested_resource_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class WorkshopRequestedResourceTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/models/workshop_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class WorkshopTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end