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

Conflicts:
	src/main/scala/Problem47.scala