Merge branch 'master' of https://github.com/RoadWarrior/AlgoRepo.git

Conflicts:
	EChanBook2/example_4_1.py
Merge branch 'master' of https://github.com/RoadWarrior/AlgoRepo.git

Conflicts:
	EChanBook2/example_4_1.py
Merge branch 'master' of https://github.com/RoadWarrior/AlgoRepo.git
update 20140528