Updated ChangeLog for hw12
Merge pull request #13 from zhopping/hw12

Final changes for hw12