edit presentation.md
conflict
edit #5, 6
Merge pull request #72 from ICTKyouikukei2013/mizushiri

Mizushiri