Edits on nearly every line. As is my way.
Merge branch 'master' of github.com:Baka-Chi/Chuunibyou-Ren

Conflicts:
	[Baka-Chi] Chuunibyou demo Koi ga Shitai! Ren - 01 [720p].ass