Bug fix
Merge branch 'cs100-2014fall' of https://github.com/mikeizbicki/ucr-cs100 into cs100-2014fall