update framework files
replace framework files
Merge pull request #91 from ICTKyouikukei2013/kamiya/framework

Kamiya/framework
edit slide
edit slide
update framework files
Merge pull request #95 from ICTKyouikukei2013/kamiya/framework

update framework files
conflict
edit slide #7, 15
Merge pull request #94 from ICTKyouikukei2013/mizushiri

Mizushiri