changed
Merge branch 'master' of github.com:takuaraki/takuaraki.github.io
conflict solved2
Merge branch 'master' of github.com:takuaraki/takuaraki.github.io