Update 03.answer.scala

Should be `&&` instead of `||`
Merge remote-tracking branch 'upstream/master'
Solved exercises 2.3, 2.4 and 2.5