Merge pull request #1 from ishida83/master

merged main.css
Merge pull request #2 from judas1017/master

Merge pull request #1 from ishida83/master