ic
Merge branch 'master' of https://github.com/kaoru17th/topclass

Conflicts:
	app/views/layouts/application.html.erb
	db/schema.rb
Merge branch 'master' of https://github.com/kaoru17th/topclass