a

a
Merge branch 'master' of https://github.com/zxz115/rail88

Conflicts:
	Gemfile
	app/controllers/admin/columns_controller.rb
	app/controllers/admin/superadmins_controller.rb
	app/controllers/logos_controller.rb
	app/views/admin/columns/_form_sequence.html.erb
	app/views/admin/columns/_form_sequence_second.html.erb
	app/views/admin/columns/index.html.erb
	app/views/admin/feedbacks/_form.html.erb
	app/views/layouts/template.html.erb
	app/views/template/columnPage.html.erb
	app/views/template/contentPage.html.erb
	app/views/template/index.html.erb
	config/database.yml