Implemented recommended changes
Merge branch 'cs100-2014fall' of https://github.com/Dave864/ucr-cs100 into cs100-2014fall
Attempting to sqaush commits