base.jsを編集
Merge branch 'develop' of https://github.com/edisonthk/presentation_project into develop
Merge branch 'develop' of https://github.com/edisonthk/presentation_project into develop
メニューを作成
merge conflict fixed