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

Conflicts:
	Gemfile
	Gemfile.lock

test/helpers/event_types_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class EventTypesHelperTest < ActionView::TestCase
+end

test/helpers/events_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class EventsHelperTest < ActionView::TestCase
+end

test/helpers/workshop_facilitators_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class WorkshopFacilitatorsHelperTest < ActionView::TestCase
+end

test/helpers/workshop_requested_resources_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class WorkshopRequestedResourcesHelperTest < ActionView::TestCase
+end

test/helpers/workshops_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class WorkshopsHelperTest < ActionView::TestCase
+end