forgot to check in these changes
Merge branch 'master' of github.com:maxtaco/project-euler

Conflicts:
	282/phi.iced