Creating branch
Creating Branch
Deleted most work
Everything except constDecl is complete
New master
Merge branch 'master' into refractoring

Conflicts:
	lab2/.cache
	lab2/src/main/scala/Lab2.scala
	lab2/target/scala-2.10/classes/Lab2$.class
Merge Attempt 3