branchAkiyum

branchAkiyum
フッタ追加してみたよ。
フッタ追加してみたよ。
Merge branch 'nayo_branch'

Conflicts:
	index.html
Merge branch 'akiyum'
Merge branch 'master' into akiyum
sideバー
Revert "sideバー"

This reverts commit 03e2bcb91e54e7bf06765b10c9af6fe4b8d2d465.
Revert "Revert "sideバー""

This reverts commit b0ab70258d07ea104c002890cc0bf92ba4295985.
Revert "Revert "Revert "sideバー"""

This reverts commit 47ad778e9b65df7a3e3bfb57e7617a9bc064aa7e.
Revert "Revert "Revert "Revert "sideバー""""

This reverts commit ea536b273b72ea269f7f8969b800a7d9176de64a.
Merge branch 'akiyum'
Merge branch 'master' into nayo_branch