3.2

Covers changes found in chapter 3.2. Also deleted .DS_Store, since it
wasn't needed.