update Lab2.scala and add Lab2.jsy
Merge remote-tracking branch 'origin/master'
merge with remote