Merge pull request #1 from adurity/master

Discovered second instance of 20% bug
Lectures for 4/1