Merge pull request #14 from curucharles/master

ok
マジキチ集会第２回目