Improved substitute. Feel free to ignore these comments.
I should probably go to bed, but that's test #4
Passing 5 tests
prettifying
Merge branch 'master' of https://github.com/nicot/scalascript

Conflicts:
	src/main/scala/Lab5.scala