final submission of HW4
Merge pull request #628 from ogonz007/cs100-2014fall

final submission of HW4