mergin
Merge branch 'master' of http://github.com/alvarogonzalezsotillo/project-euler

Conflicts:
	src/main/scala/Problem29.scala