chapter3 modified
etc.
Merge branch 'master' of https://github.com/Hiroshi-Ito/jk2014

Conflicts:
	_build/doctrees/chapter1.doctree
	_build/doctrees/chapter2.doctree
	_build/doctrees/chapter3.doctree
	_build/doctrees/environment.pickle
	_build/doctrees/index.doctree
	chapter2.rst