Assignment 2 - Chloe Calvarin / Matt Cook

Some of these defs could have been simplified to a single line, to be a little more Scala-y.