Added solutions 19, 20 and 21

Added solutions to problems 22, 23, 24 and 25
Adding something for testing merges

Adding some conflicting text
Merge branch 'master' of https://github.com/vmalarcon/scala99

Conflicts:
	merge.txt