update 2014-05-10
Merge branch 'master' of https://github.com/RoadWarrior/AlgoRepo.git

Conflicts:
	example_2_7.py