tempaku.txtをmarkdownへ変更
Merge branch 'master' of https://github.com/yantene/tut-manual

Conflicts:
	tempaku.md