hw4 commit
Merge pull request #629 from nmlapre/cs100-2014fall

hw4 commit - comments welcome
Merge remote-tracking branch 'upstream/cs100-2014fall' into cs100-2014fall