Pulled back the old lectures so that I don't break links for the current class
Fixed some git merge errors in lecture 1