edit_intro1
Merge pull request #1 from mahouShounen/master

edit_intro1