Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	modified:   app/controllers/admin/authorizations_controller.rb
	modified:   app/controllers/admin/campus_controller.rb
	modified:   app/controllers/admin/campus_schedules_controller.rb
	modified:   app/controllers/admin/course_subject_controller.rb
	modified:   app/controllers/admin/courses_controller.rb
	modified:   app/controllers/admin/laboratories_controller.rb
	modified:   app/controllers/admin/schoolrooms_controller.rb
	modified:   app/controllers/admin/semesters_controller.rb
	modified:   app/controllers/admin/teacher_controller.rb
	modified:   config/routes.rb

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

	both modified:      app/controllers/admin/classrooms_controller.rb
	both modified:      app/views/layouts/admin.html.erb
	both modified:      db/schema.rb

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	app/assets/javascripts/admin/permission.coffee
	app/assets/javascripts/admin/user.coffee
	app/assets/stylesheets/admin/permission.scss
	app/assets/stylesheets/admin/user.scss
	app/controllers/admin/permission_controller.rb
	app/controllers/admin/user_controller.rb
	app/helpers/admin/permission_helper.rb
	app/helpers/admin/user_helper.rb
	app/policies/
	app/views/admin/lessons/_lesson.html.erb
	app/views/admin/permission/
	app/views/admin/user/
	db/migrate/20170723123503_create_permissions.rb
	test/controllers/admin/permission_controller_test.rb
	test/controllers/admin/user_controller_test.rb