homework 2
hw2 edits
Get rid of white flashing
Merge remote-tracking branch 'upstream/master'