chapter 1 completed
middle in the chapter 2
Merge branch 'master' of https://github.com/kazuhayase/study
Merge branch 'master' of https://github.com/kazuhayase/study

Conflicts:
	c++/pro-con/ch1/triangle.cpp