?
Merge branch 'master' of https://github.com/gefei/project-euler

Conflicts:
	euler.py