Fixing typo
Merge branch 'master' of https://github.com/hmc-cs111-fall2014/scala-labs

* 'master' of https://github.com/hmc-cs111-fall2014/scala-labs:
  Fixing typo