merging
Merge commit 'e4a977d'

Conflicts:
	src/main/scala/Problem47.scala
started 50, 49 lost in a224
on 50