Back 2 paradise
e
Merge branch 'master' of https://github.com/sajit/skalad

Conflicts:
	src/main/scala/problems/Main.scala
merge fix