Clean and Update

Cleaned up unneeded file and added working version of lab2.scala and
lab2.jsy
Cleaned up

cleaned up lab2.scala
Merge pull request #5 from Jessica-L/NoahBranch

Noah branch