Chapter 2

Moved some stuff around also (lab1 -> chapter1)