1 Test Remaining
Merge branch 'master' of https://github.com/CUBoulderBoy/CSCI3155Lab2

Conflicts:
	src/main/scala/Lab2.scala