hw4
Merge pull request #677 from ogonz007/cs100-2014fall

hw4 submission