End of part 2.
Fix merge conflict
End of part 3.
another strange commit
erge branch '2014-10-27' of https://github.com/rangle/ngcourse into 2014-10-27
Ending part 4.
Almost done with part 6.
Merge branch '2014-10-27' of https://github.com/rangle/ngcourse into 2014-10-27