いろいろ。
Merge branch 'master' of https://github.com/mkiken/CompetitiveProgramming

Conflicts:
	rb/template.rb