clean
merge
Merge branch 'master' into HEAD

Conflicts:
	euler.py