Clean up errors introduced in previous merge

There were a couple of ugly things introduced in last previous manual merge:
* Class 1 had a bunch of repeated slides starting from the Browser Compatibility section, as well as an unclosed section tag that made the slide transitions go wonky
* Class 3 had manual merge junk (>>>>>>>HEAD and the like)

This commit also cleans up some trailing whitespace in those two files.