commit from 12/16/13 15:42:02. 3 deletions, 3 adds, 2 modifications