HW4 resubmission
Merge pull request #687 from hray001/cs100-2014fall

HW4 resubmission