test code doesn't belong here.
Merge branch 'master' of https://github.com/hmc-cs111-fall2014/variables-and-functions

* 'master' of https://github.com/hmc-cs111-fall2014/variables-and-functions:
  Fixing typop