I made a change. FIND IT.
Merge remote-tracking branch 'kris24/Class_2013_01_06' into
Class_2013_01_06

Merged in Kris's comment.