Fixed previous change
Fixed typo and added space
Merge branch 'cs100-2014fall' of https://github.com/jfan013/ucr-cs100 into cs100-2014fall
Fixed typo and added space