Swapping order to tests to match code in lab files.
Merge branch 'master' of https://github.com/hmc-cs111-fall2014/scala-labs

* 'master' of https://github.com/hmc-cs111-fall2014/scala-labs:
  Swapping order to tests to match code in lab files.