0f0c826 branch

homework/HW0.ipynb in [HEAD](https://github.com/cs109/2014/commit/dc039d13126887b6957eea328d4f18068095e4f9) is an unmerged file (see first diff), hence it cannot be parsed by the ipynb server, [resulting in a 400: Bad Request error] (http://nbviewer.ipython.org/github/cs109/2014/blob/master/homework/HW0.ipynb).

It seems that the reason for the merge conflicts was a end-of-line mismatch; I replaced all the CRLFs with LFs.