Merge branch 'master' of git.unl.edu:iim/unl-resource-scheduler

Gemfile.lock

@@ -149,5 +149,8 @@ DEPENDENCIES
   thin
   unicorn
 
+RUBY VERSION
+   ruby 2.2.3p173
+
 BUNDLED WITH
-   1.10.6
+   1.13.0

db/migrate/20151218100000_add_permissions.rb

@@ -24,16 +24,6 @@ class AddPermissions < ActiveRecord::Migration
 		Permission.create(:name => 'Manage Space Hours')
 		Permission.create(:name => 'Manage Events')
 		Permission.create(:name => 'See Agenda')
-
-		# give all permissions including super user to tyler & lowad
-		permissions = Permission.all
-
-		tyler = User.find_by(:username => 'tyler')
-		lowad2 = User.find_by(:username => 'lowad2')
-		permissions.each do |perm| 
-			tyler.permissions << perm
-			lowad2.permissions << perm
-		end
 	end
 
 	def down

db/migrate/20160629000000_add_super_admin_and_images.rb

@@ -12,11 +12,6 @@ class AddSuperAdminAndImages < ActiveRecord::Migration
 			t.string :description
 			t.integer :user_id
 		end
-
-		User.reset_column_information
-		tyler = User.find_by(:username => 's-tlembur1')
-		tyler.is_super_admin = true
-		tyler.save
 	end
 
 	def down