Merge changes for the first lecture on complex numbers